[asterisk-commits] russell: branch russell/debug_threads r77839 - /team/russell/debug_threads/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Jul 31 14:06:53 2007
New Revision: 77839

URL: http://svn.digium.com/view/asterisk?view=rev&rev=77839
Log:
dont install in the non-optimized target ... that is so annoying

Modified:
    team/russell/debug_threads/Makefile
    team/russell/debug_threads/utils.c

Modified: team/russell/debug_threads/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/debug_threads/Makefile?view=diff&rev=77839&r1=77838&r2=77839
==============================================================================
--- team/russell/debug_threads/Makefile (original)
+++ team/russell/debug_threads/Makefile Tue Jul 31 14:06:53 2007
@@ -869,7 +869,7 @@
 		exit 1; \
 	fi 
 
-dont-optimize: install
+dont-optimize: _all
 
 valgrind: dont-optimize
 

Modified: team/russell/debug_threads/utils.c
URL: http://svn.digium.com/view/asterisk/team/russell/debug_threads/utils.c?view=diff&rev=77839&r1=77838&r2=77839
==============================================================================
--- team/russell/debug_threads/utils.c (original)
+++ team/russell/debug_threads/utils.c Tue Jul 31 14:06:53 2007
@@ -502,13 +502,14 @@
 /*! \brief Keep track of which locks a thread holds */
 struct thr_lock_info {
 	pthread_t thread_id;
-	const char *file[AST_MAX_LOCKS];
-	int line_num[AST_MAX_LOCKS];
-	const char *func[AST_MAX_LOCKS];
-	const char *lock_name[AST_MAX_LOCKS];
-	void *lock_addr[AST_MAX_LOCKS];
-	/*! How many times this thread has locked this lock */
-	int times_locked[AST_MAX_LOCKS];
+	struct {
+		const char *file;
+		int line_num;
+		const char *func;
+		const char *lock_name;
+		void *lock_addr;
+		int times_locked;
+	} locks[AST_MAX_LOCKS];
 	unsigned int num_locks;
 };
 
@@ -525,21 +526,62 @@
 	const char *func, const char *lock_name, void *lock_addr)
 {
 	struct thr_lock_info *lock_info;
+	int i;
 
 	if (!(lock_info = ast_threadstorage_get(&thread_lock_info, sizeof(*lock_info))))
 		return;
 
+	for (i = 0; i < lock_info->num_locks; i++) {
+		if (lock_info->locks[i].lock_addr == lock_addr) {
+			lock_info->locks[i].times_locked++;
+			return;
+		}
+	}
+
+	if (lock_info->num_locks == AST_MAX_LOCKS) {
+		/* Can't use ast_log here, because it will cause infinite recursion */
+		fprintf(stderr, "XXX ERROR XXX A thread holds more locks than '%d'."
+			"  Increase AST_MAX_LOCKS!\n", AST_MAX_LOCKS);
+		return;
+	}
 	
+	lock_info->locks[i].file = filename;
+	lock_info->locks[i].line_num = line_num;
+	lock_info->locks[i].func = func;
+	lock_info->locks[i].lock_name = lock_name;
+	lock_info->locks[i].lock_addr = lock_addr;
+	lock_info->locks[i].times_locked = 1;
+	lock_info->num_locks++;
 }
 
 void ast_remove_lock_info(void *lock_addr)
 {
 	struct thr_lock_info *lock_info;
+	int i = 0;
 
 	if (!(lock_info = ast_threadstorage_get(&thread_lock_info, sizeof(*lock_info))))
 		return;
 
-
+	for (i = lock_info->num_locks - 1; i >= 0; i--) {
+		if (lock_info->locks[i].lock_addr == lock_addr)
+			break;
+	}
+
+	if (i == -1) /* Lock not found :( */
+		return;
+
+	if (lock_info->locks[i].times_locked > 1) {
+		lock_info->locks[i].times_locked--;
+		return;
+	}
+
+	if (i < lock_info->num_locks - 1) {
+		/* Not the last one ... *should* be rare! */
+		memmove(&lock_info->locks[i], &lock_info->locks[i + 1], 
+			(lock_info->num_locks - (i + 1)) * sizeof(lock_info->locks[0]));
+	}
+
+	lock_info->num_locks--;
 }
 
 #endif /* DEBUG_THREADS */