[asterisk-commits] mjordan: branch mjordan/1.8_instrumented r362676 - /team/mjordan/1.8_instrume...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 19 15:40:51 CDT 2012
Author: mjordan
Date: Thu Apr 19 15:40:48 2012
New Revision: 362676
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=362676
Log:
Really, really, really throttle that back.
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=362676&r1=362675&r2=362676
==============================================================================
--- team/mjordan/1.8_instrumented/main/lock.c (original)
+++ team/mjordan/1.8_instrumented/main/lock.c Thu Apr 19 15:40:48 2012
@@ -763,7 +763,7 @@
}
if (t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, lineno, func, __LINE__);
}
lt->file[0] = filename;
@@ -815,7 +815,7 @@
if (t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
if (lt->reentrancy) {
@@ -847,7 +847,7 @@
filename, line, func, name);
lt->reentrancy = 0;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -908,14 +908,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p released by %s line %d (%s)\n", lt, filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -939,7 +939,7 @@
filename, line, func, (int)wait_time, name);
if (t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
#ifdef HAVE_BKTR
@@ -951,7 +951,7 @@
#ifdef HAVE_BKTR
__dump_backtrace(<->backtrace[lt->reentrancy-1], canlog);
#endif
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -969,7 +969,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -979,7 +979,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -990,11 +990,11 @@
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
bt = <->backtrace[lt->reentrancy-1];
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1052,14 +1052,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1083,7 +1083,7 @@
filename, line, func, (int)wait_time, name);
if (t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
#ifdef HAVE_BKTR
@@ -1095,7 +1095,7 @@
#ifdef HAVE_BKTR
__dump_backtrace(<->backtrace[lt->reentrancy-1], canlog);
#endif
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1113,7 +1113,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -1123,7 +1123,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1134,11 +1134,11 @@
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
bt = <->backtrace[lt->reentrancy-1];
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1200,14 +1200,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1239,7 +1239,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -1249,7 +1249,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1260,11 +1260,11 @@
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
bt = <->backtrace[lt->reentrancy-1];
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1322,14 +1322,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1361,7 +1361,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -1371,7 +1371,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1382,11 +1382,11 @@
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
}
bt = <->backtrace[lt->reentrancy-1];
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1447,14 +1447,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1470,7 +1470,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -1480,7 +1480,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1529,14 +1529,14 @@
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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(<->backtrace[lt->reentrancy]);
bt = <->backtrace[lt->reentrancy];
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
@@ -1552,7 +1552,7 @@
#ifdef DEBUG_THREADS
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__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) {
@@ -1562,7 +1562,7 @@
lt->thread[lt->reentrancy] = pthread_self();
lt->reentrancy++;
}
- if (strcmp(func, "logger_print_normal")) {
+ if (!strcmp(filename, "asterisk.c")) {
__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
}
ast_reentrancy_unlock(lt);
More information about the asterisk-commits
mailing list