[asterisk-commits] russell: trunk r91197 - in /trunk: ./ main/threadstorage.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Dec  5 11:49:03 2007
New Revision: 91197

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91197
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/threadstorage.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/threadstorage.c
URL: http://svn.digium.com/view/asterisk/trunk/main/threadstorage.c?view=diff&rev=91197&r1=91196&r2=91197
==============================================================================
--- trunk/main/threadstorage.c (original)
+++ trunk/main/threadstorage.c Wed Dec  5 11:49:03 2007
@@ -52,7 +52,9 @@
 	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 @@
 	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 @@
 		}
 	}
 	AST_LIST_TRAVERSE_SAFE_END;
-	AST_RWLIST_UNLOCK(&tls_objects);
+	ast_mutex_unlock(&threadstoragelock);
 	if (to)
 		ast_free(to);
 }
@@ -94,7 +96,7 @@
 {
 	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 @@
 		}
 	}
 	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 @@
 	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 @@
 		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 @@
 	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 @@
 		file->count++;
 	}
 
-	AST_RWLIST_UNLOCK(&tls_objects);
+	ast_mutex_unlock(&threadstoragelock);
 	
 	AST_LIST_TRAVERSE(&file_summary, file, entry) {
 		len += file->len;