[svn-commits] mjordan: branch mjordan/1.8_instrumented r362672 - /team/mjordan/1.8_instrume...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Apr 19 15:18:33 2012
New Revision: 362672

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=362672
Log:
Throttle back the messages from stuff we aren't going to care about

Modified:
    team/mjordan/1.8_instrumented/main/lock.c

Modified: team/mjordan/1.8_instrumented/main/lock.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/lock.c?view=diff&rev=362672&r1=362671&r2=362672
==============================================================================
--- team/mjordan/1.8_instrumented/main/lock.c (original)
+++ team/mjordan/1.8_instrumented/main/lock.c Thu Apr 19 15:18:33 2012
@@ -763,7 +763,9 @@
 	}
 	if (t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, lineno, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, lineno, func, __LINE__);
+		}
 		lt->file[0] = filename;
 		lt->lineno[0] = lineno;
 		lt->func[0] = func;
@@ -813,7 +815,9 @@
 
 	if (t->tracking) {
 		ast_reentrancy_lock(lt);
- 		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy) {
 			int i;
 			pthread_t self = pthread_self();
@@ -843,7 +847,9 @@
 					filename, line, func, name);
 			lt->reentrancy = 0;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 
 #ifdef HAVE_BKTR
@@ -902,12 +908,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p released by %s line %d (%s)\n", lt, filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_RDLOCK, filename, line, func, name, t, bt);
 #else
@@ -929,7 +939,9 @@
 						filename, line, func, (int)wait_time, name);
 					if (t->tracking) {
 						ast_reentrancy_lock(lt);
-						__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+						if (strcmp(func, "logger_print_normal")) {
+							__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+						}
 #ifdef HAVE_BKTR
 						__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
 #endif
@@ -939,7 +951,9 @@
 #ifdef HAVE_BKTR
 						__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
 #endif
-						__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+						if (strcmp(func, "logger_print_normal")) {
+							__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+						}
 						ast_reentrancy_unlock(lt);
 					}
 					reported_wait = wait_time;
@@ -955,7 +969,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -963,7 +979,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		if (t->tracking) {
 			ast_mark_lock_acquired(t);
@@ -972,9 +990,13 @@
 #ifdef HAVE_BKTR
 		if (lt->reentrancy) {
 			ast_reentrancy_lock(lt);
-			__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+			}
 			bt = &lt->backtrace[lt->reentrancy-1];
-			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			}
 			ast_reentrancy_unlock(lt);
 		} else {
 			bt = NULL;
@@ -1030,12 +1052,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t, bt);
 #else
@@ -1057,7 +1083,9 @@
 						filename, line, func, (int)wait_time, name);
 					if (t->tracking) {
 						ast_reentrancy_lock(lt);
-						__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+						if (strcmp(func, "logger_print_normal")) {
+							__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+						}
 #ifdef HAVE_BKTR
 						__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
 #endif
@@ -1067,7 +1095,9 @@
 #ifdef HAVE_BKTR
 						__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
 #endif
-						__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+						if (strcmp(func, "logger_print_normal")) {
+							__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+						}
 						ast_reentrancy_unlock(lt);
 					}
 					reported_wait = wait_time;
@@ -1083,7 +1113,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -1091,7 +1123,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		if (t->tracking) {
 			ast_mark_lock_acquired(t);
@@ -1100,9 +1134,13 @@
 #ifdef HAVE_BKTR
 		if (lt->reentrancy) {
 			ast_reentrancy_lock(lt);
-			__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+			}
 			bt = &lt->backtrace[lt->reentrancy-1];
-			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			}
 			ast_reentrancy_unlock(lt);
 		} else {
 			bt = NULL;
@@ -1162,12 +1200,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t, bt);
 #else
@@ -1197,7 +1239,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -1205,7 +1249,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		if (t->tracking) {
 			ast_mark_lock_acquired(t);
@@ -1214,9 +1260,13 @@
 #ifdef HAVE_BKTR
 		if (lt->reentrancy) {
 			ast_reentrancy_lock(lt);
-			__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+			}
 			bt = &lt->backtrace[lt->reentrancy-1];
-			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			}
 			ast_reentrancy_unlock(lt);
 		} else {
 			bt = NULL;
@@ -1272,12 +1322,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t, bt);
 #else
@@ -1307,7 +1361,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -1315,7 +1371,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		if (t->tracking) {
 			ast_mark_lock_acquired(t);
@@ -1324,9 +1382,13 @@
 #ifdef HAVE_BKTR
 		if (lt->reentrancy) {
 			ast_reentrancy_lock(lt);
-			__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+			}
 			bt = &lt->backtrace[lt->reentrancy-1];
-			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			if (strcmp(func, "logger_print_normal")) {
+				__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+			}
 			ast_reentrancy_unlock(lt);
 		} else {
 			bt = NULL;
@@ -1385,12 +1447,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_RDLOCK, filename, line, func, name, t, bt);
 #else
@@ -1404,7 +1470,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -1412,7 +1480,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		if (t->tracking) {
 			ast_mark_lock_acquired(t);
@@ -1459,12 +1529,16 @@
 	if (t->tracking) {
 #ifdef HAVE_BKTR
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy != AST_MAX_REENTRANCY) {
 			ast_bt_get_addresses(&lt->backtrace[lt->reentrancy]);
 			bt = &lt->backtrace[lt->reentrancy];
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t, bt);
 #else
@@ -1478,7 +1552,9 @@
 #ifdef DEBUG_THREADS
 	if (!res && t->tracking) {
 		ast_reentrancy_lock(lt);
-		__ast_mutex_logger("Global lock obtained by %s line %d (%s) at %d\n", filename, line, func, __LINE__);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+		}
 		if (lt->reentrancy < AST_MAX_REENTRANCY) {
 			lt->file[lt->reentrancy] = filename;
 			lt->lineno[lt->reentrancy] = line;
@@ -1486,7 +1562,9 @@
 			lt->thread[lt->reentrancy] = pthread_self();
 			lt->reentrancy++;
 		}
-		__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		if (strcmp(func, "logger_print_normal")) {
+			__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+		}
 		ast_reentrancy_unlock(lt);
 		ast_mark_lock_acquired(t);
 	} else if (t->tracking) {