kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with AST_THREADSTORAGE_RAW when DEBUG_THREADLOCALS is enabled.

Browse Source 
When DEBUG_THREADLOCALS is enabled it causes the threadlocal cleanup to be
called as a function.  This causes a compile error with raw threadstorage as
it uses NULL for cleanup.  This fix uses a macro that provides NULL when
DEBUG_THREADLOCALS is disabled, and replaces the call to "c_cleanup(data);"
with "{};" when DEBUG_THREADLOCALS is enabled.

ASTERISK-24975 #close
Reported by: Ashley Sanders

Change-Id: I3ef7428ee402816d9fcefa1b3b95830c00d5c402
This commit is contained in:
Corey Farrell
2015-04-17 17:19:24 -04:00
parent 8435a0cdff
commit c1d44ff043
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/threadstorage.h
View File

@@ -64,6 +64,9 @@ struct ast_threadstorage {
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);
void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len); void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len);
#define THREADSTORAGE_RAW_CLEANUP(v) {}
#else
#define THREADSTORAGE_RAW_CLEANUP NULL
#endif /* defined(DEBUG_THREADLOCALS) */ #endif /* defined(DEBUG_THREADLOCALS) */
/*! /*!
@@ -85,7 +88,7 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len
#define AST_THREADSTORAGE_EXTERNAL(name) \ #define AST_THREADSTORAGE_EXTERNAL(name) \
extern struct ast_threadstorage name extern struct ast_threadstorage name
#define AST_THREADSTORAGE_RAW(name) \ #define AST_THREADSTORAGE_RAW(name) \
AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, NULL,) AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, THREADSTORAGE_RAW_CLEANUP,)
/*! /*!
* \brief Define a thread storage variable, with custom initialization and cleanup * \brief Define a thread storage variable, with custom initialization and cleanup