diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-05 17:49:03 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-05 17:49:03 +0000 |
commit | ea3565c2e52f0577220dfce11b663542d10c9be5 (patch) | |
tree | b4fc8068fa9b954b33b39c207c5dd5d8f309f7df /main/threadstorage.c | |
parent | 0738ce5f9e49fb9fda6ac67b2a658fba15dfe958 (diff) |
Merged revisions 91192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r91192 | russell | 2007-12-05 11:31:42 -0600 (Wed, 05 Dec 2007) | 10 lines
Make the lock in the threadstorage debugging code untracked to avoid a deadlock
on thread destruction.
(closes issue #11207)
Reported by: ys
Patches:
threadstorage.c.diff uploaded by ys (license 281)
Also fixes an open bug report: (closes issue #11446)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91197 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/threadstorage.c')
-rw-r--r-- | main/threadstorage.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/main/threadstorage.c b/main/threadstorage.c index 35d3eca55..ae1719ff8 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -52,7 +52,9 @@ struct tls_object { AST_LIST_ENTRY(tls_object) entry; }; -static AST_RWLIST_HEAD_STATIC(tls_objects, tls_object); +static AST_LIST_HEAD_NOLOCK_STATIC(tls_objects, tls_object); +AST_MUTEX_DEFINE_STATIC_NOTRACKING(threadstoragelock); + void __ast_threadstorage_object_add(void *key, size_t len, const char *file, const char *function, unsigned int line) { @@ -68,16 +70,16 @@ void __ast_threadstorage_object_add(void *key, size_t len, const char *file, con to->line = line; to->thread = pthread_self(); - AST_RWLIST_WRLOCK(&tls_objects); + ast_mutex_lock(&threadstoragelock); AST_LIST_INSERT_TAIL(&tls_objects, to, entry); - AST_RWLIST_UNLOCK(&tls_objects); + ast_mutex_unlock(&threadstoragelock); } void __ast_threadstorage_object_remove(void *key) { struct tls_object *to; - AST_RWLIST_WRLOCK(&tls_objects); + ast_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE_SAFE_BEGIN(&tls_objects, to, entry) { if (to->key == key) { AST_LIST_REMOVE_CURRENT(entry); @@ -85,7 +87,7 @@ void __ast_threadstorage_object_remove(void *key) } } AST_LIST_TRAVERSE_SAFE_END; - AST_RWLIST_UNLOCK(&tls_objects); + ast_mutex_unlock(&threadstoragelock); if (to) ast_free(to); } @@ -94,7 +96,7 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len { struct tls_object *to; - AST_RWLIST_WRLOCK(&tls_objects); + ast_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE_SAFE_BEGIN(&tls_objects, to, entry) { if (to->key == key_old) { to->key = key_new; @@ -103,7 +105,7 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len } } AST_LIST_TRAVERSE_SAFE_END; - AST_RWLIST_UNLOCK(&tls_objects); + ast_mutex_unlock(&threadstoragelock); } static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) @@ -131,7 +133,7 @@ static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, if (a->argc > 3) fn = a->argv[3]; - AST_RWLIST_RDLOCK(&tls_objects); + ast_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE(&tls_objects, to, entry) { if (fn && strcasecmp(to->file, fn)) @@ -143,7 +145,7 @@ static char *handle_cli_threadstorage_show_allocations(struct ast_cli_entry *e, count++; } - AST_RWLIST_UNLOCK(&tls_objects); + ast_mutex_unlock(&threadstoragelock); ast_cli(a->fd, "%10d bytes allocated in %d allocation%s\n", (int) len, count, count > 1 ? "s" : ""); @@ -182,7 +184,7 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int if (a->argc > 3) fn = a->argv[3]; - AST_RWLIST_RDLOCK(&tls_objects); + ast_mutex_lock(&threadstoragelock); AST_LIST_TRAVERSE(&tls_objects, to, entry) { if (fn && strcasecmp(to->file, fn)) @@ -204,7 +206,7 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int file->count++; } - AST_RWLIST_UNLOCK(&tls_objects); + ast_mutex_unlock(&threadstoragelock); AST_LIST_TRAVERSE(&file_summary, file, entry) { len += file->len; |