kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 177701 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r177701 | tilghman | 2009-02-20 15:15:01 -0600 (Fri, 20 Feb 2009) | 3 lines
  
  This exception does not appear to still be true for Solaris 10, and OpenSolaris definitely needs it to be removed.
  Fixed for snuff-home on -dev channel.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-02-20 21:25:37 +00:00
parent 83bbf83f49
commit 9967ef01df
1 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
include/asterisk/threadstorage.h
View File

@@ -60,12 +60,6 @@ struct ast_threadstorage {
int (*custom_init)(void *); /*!< Custom initialization function specific to the object */ int (*custom_init)(void *); /*!< Custom initialization function specific to the object */
}; };
#ifdef SOLARIS
#define THREADSTORAGE_ONCE_INIT {PTHREAD_ONCE_INIT}
#else
#define THREADSTORAGE_ONCE_INIT PTHREAD_ONCE_INIT
#endif
#if defined(DEBUG_THREADLOCALS) #if defined(DEBUG_THREADLOCALS)
void __ast_threadstorage_object_add(void *key, size_t len, const char *file, const char *function, unsigned int line); void __ast_threadstorage_object_add(void *key, size_t len, const char *file, const char *function, unsigned int line);
void __ast_threadstorage_object_remove(void *key); void __ast_threadstorage_object_remove(void *key);
@@ -111,32 +105,32 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len
#if !defined(DEBUG_THREADLOCALS) #if !defined(DEBUG_THREADLOCALS)
#define AST_THREADSTORAGE_CUSTOM_SCOPE(name, c_init, c_cleanup, scope) \ #define AST_THREADSTORAGE_CUSTOM_SCOPE(name, c_init, c_cleanup, scope) \
static void __init_##name(void); \ static void __init_##name(void); \
scope struct ast_threadstorage name = { \ scope struct ast_threadstorage name = { \
.once = THREADSTORAGE_ONCE_INIT, \ .once = PTHREAD_ONCE_INIT, \
.key_init = __init_##name, \ .key_init = __init_##name, \
.custom_init = c_init, \ .custom_init = c_init, \
}; \ }; \
static void __init_##name(void) \ static void __init_##name(void) \
{ \ { \
pthread_key_create(&(name).key, c_cleanup); \ pthread_key_create(&(name).key, c_cleanup); \
} }
#else /* defined(DEBUG_THREADLOCALS) */ #else /* defined(DEBUG_THREADLOCALS) */
#define AST_THREADSTORAGE_CUSTOM_SCOPE(name, c_init, c_cleanup, scope) \ #define AST_THREADSTORAGE_CUSTOM_SCOPE(name, c_init, c_cleanup, scope) \
static void __init_##name(void); \ static void __init_##name(void); \
scope struct ast_threadstorage name = { \ scope struct ast_threadstorage name = { \
.once = THREADSTORAGE_ONCE_INIT, \ .once = PTHREAD_ONCE_INIT, \
.key_init = __init_##name, \ .key_init = __init_##name, \
.custom_init = c_init, \ .custom_init = c_init, \
}; \ }; \
static void __cleanup_##name(void *data) \ static void __cleanup_##name(void *data) \
{ \ { \
__ast_threadstorage_object_remove(data); \ __ast_threadstorage_object_remove(data); \
c_cleanup(data); \ c_cleanup(data); \
} \ } \
static void __init_##name(void) \ static void __init_##name(void) \
{ \ { \
pthread_key_create(&(name).key, __cleanup_##name); \ pthread_key_create(&(name).key, __cleanup_##name); \
} }
#endif /* defined(DEBUG_THREADLOCALS) */ #endif /* defined(DEBUG_THREADLOCALS) */