diff options
| -rw-r--r-- | include/asterisk/threadstorage.h | 2 | ||||
| -rw-r--r-- | main/threadstorage.c | 38 |
2 files changed, 28 insertions, 12 deletions
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index cf6d47e32..c86ff04d2 100644 --- a/include/asterisk/threadstorage.h +++ b/include/asterisk/threadstorage.h @@ -198,7 +198,7 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co return NULL; } pthread_setspecific(ts->key, buf); - __ast_threadstorage_object_add(&ts->key, init_size, file, function, line); + __ast_threadstorage_object_add(buf, init_size, file, function, line); } return buf; diff --git a/main/threadstorage.c b/main/threadstorage.c index 94ea45d4e..a54ffac7a 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -53,8 +53,23 @@ struct tls_object { }; static AST_LIST_HEAD_NOLOCK_STATIC(tls_objects, tls_object); -AST_MUTEX_DEFINE_STATIC_NOTRACKING(threadstoragelock); +/* Allow direct use of pthread_mutex_t and friends */ +#undef pthread_mutex_t +#undef pthread_mutex_lock +#undef pthread_mutex_unlock +#undef pthread_mutex_init +#undef pthread_mutex_destroy + +/*! + * \brief lock for the tls_objects list + * + * \note We can not use an ast_mutex_t for this. The reason is that this + * lock is used within the context of thread-local data destructors, + * and the ast_mutex_* API uses thread-local data. Allocating more + * thread-local data at that point just causes a memory leak. + */ +static pthread_mutex_t threadstoragelock; void __ast_threadstorage_object_add(void *key, size_t len, const char *file, const char *function, unsigned int line) { @@ -70,16 +85,16 @@ void __ast_threadstorage_object_add(void *key, size_t len, const char *file, con to->line = line; to->thread = pthread_self(); - ast_mutex_lock(&threadstoragelock); + pthread_mutex_lock(&threadstoragelock); AST_LIST_INSERT_TAIL(&tls_objects, to, entry); - ast_mutex_unlock(&threadstoragelock); + pthread_mutex_unlock(&threadstoragelock); } void __ast_threadstorage_object_remove(void *key) { struct tls_object *to; - ast_mutex_lock(&threadstoragelock); + pthread_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE_SAFE_BEGIN(&tls_objects, to, entry) { if (to->key == key) { AST_LIST_REMOVE_CURRENT(entry); @@ -87,7 +102,7 @@ void __ast_threadstorage_object_remove(void *key) } } AST_LIST_TRAVERSE_SAFE_END; - ast_mutex_unlock(&threadstoragelock); + pthread_mutex_unlock(&threadstoragelock); if (to) ast_free(to); } @@ -96,7 +111,7 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len { struct tls_object *to; - ast_mutex_lock(&threadstoragelock); + pthread_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE_SAFE_BEGIN(&tls_objects, to, entry) { if (to->key == key_old) { to->key = key_new; @@ -105,7 +120,7 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len } } AST_LIST_TRAVERSE_SAFE_END; - ast_mutex_unlock(&threadstoragelock); + pthread_mutex_unlock(&threadstoragelock); } static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) @@ -133,7 +148,7 @@ static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, if (a->argc > 3) fn = a->argv[3]; - ast_mutex_lock(&threadstoragelock); + pthread_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE(&tls_objects, to, entry) { if (fn && strcasecmp(to->file, fn)) @@ -145,7 +160,7 @@ static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, count++; } - ast_mutex_unlock(&threadstoragelock); + pthread_mutex_unlock(&threadstoragelock); ast_cli(a->fd, "%10d bytes allocated in %d allocation%s\n", (int) len, count, count > 1 ? "s" : ""); @@ -184,7 +199,7 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int if (a->argc > 3) fn = a->argv[3]; - ast_mutex_lock(&threadstoragelock); + pthread_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE(&tls_objects, to, entry) { if (fn && strcasecmp(to->file, fn)) @@ -206,7 +221,7 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int file->count++; } - ast_mutex_unlock(&threadstoragelock); + pthread_mutex_unlock(&threadstoragelock); AST_LIST_TRAVERSE(&file_summary, file, entry) { len += file->len; @@ -232,6 +247,7 @@ static struct ast_cli_entry cli[] = { void threadstorage_init(void) { + pthread_mutex_init(&threadstoragelock, NULL); ast_cli_register_multiple(cli, ARRAY_LEN(cli)); } |