[asterisk-commits] mjordan: branch mjordan/1.8_instrumented r366347 - /team/mjordan/1.8_instrume...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 11 22:03:38 CDT 2012
Author: mjordan
Date: Fri May 11 22:03:35 2012
New Revision: 366347
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=366347
Log:
Throttle back, test the bailing out fix
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=366347&r1=366346&r2=366347
==============================================================================
--- team/mjordan/1.8_instrumented/main/lock.c (original)
+++ team/mjordan/1.8_instrumented/main/lock.c Fri May 11 22:03:35 2012
@@ -810,7 +810,7 @@
if (t->tracking && !t->track) {
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Should only see this once - initializing the reentrancy lock\n");
+ /*__ast_mutex_logger("Should only see this once - initializing the reentrancy lock\n");*/
}
ast_reentrancy_init(&t->track);
}
@@ -818,11 +818,11 @@
if (t->tracking) {
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Attempting to grab global lock %p for %p in unlock\n", lt, t);
+ /*__ast_mutex_logger("Attempting to grab global lock %p for %p in unlock\n", lt, t);*/
}
ast_reentrancy_lock(lt);
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+ /*__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;
@@ -855,7 +855,7 @@
}
ast_reentrancy_unlock(lt);
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
#ifdef HAVE_BKTR
ast_remove_lock_info(t, bt);
@@ -875,7 +875,7 @@
DO_THREAD_CRASH;
}
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Exiting unlock\n");
+ /*__ast_mutex_logger("Exiting unlock\n");*/
}
#endif /* DEBUG_THREADS */
return res;
@@ -915,18 +915,18 @@
if (t->tracking) {
#ifdef HAVE_BKTR
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Attempting to grab global lock %p for %p in rdlock\n", lt, t);
+ /*__ast_mutex_logger("Attempting to grab global lock %p for %p in rdlock\n", lt, t);*/
}
ast_reentrancy_lock(lt);
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+ /*__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(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock %p released by %s line %d (%s)\n", lt, filename, line, func);
+ /*__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);
@@ -980,7 +980,7 @@
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+ /*__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;
@@ -990,7 +990,7 @@
lt->reentrancy++;
}
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
@@ -1001,11 +1001,11 @@
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
if (!strcmp(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock %p obtained by %s line %d (%s) at %d\n", lt, filename, line, func, __LINE__);
+ /*__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(filename, "asterisk.c") && !strcmp(func, "ast_register_thread")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
} else {
@@ -1219,14 +1219,14 @@
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__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);
@@ -1258,7 +1258,7 @@
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
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__);
+ /*__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;
@@ -1268,7 +1268,7 @@
lt->reentrancy++;
}
if (!strcmp(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
@@ -1279,11 +1279,11 @@
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
} else {
@@ -1341,14 +1341,14 @@
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ *//*__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);
@@ -1380,7 +1380,7 @@
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
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__);
+ /*__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;
@@ -1390,7 +1390,7 @@
lt->reentrancy++;
}
if (!strcmp(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
@@ -1401,11 +1401,11 @@
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
} else {
@@ -1466,14 +1466,14 @@
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__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);
@@ -1489,7 +1489,7 @@
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
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__);
+ /*__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;
@@ -1499,7 +1499,7 @@
lt->reentrancy++;
}
if (!strcmp(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
@@ -1548,14 +1548,14 @@
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
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__);
+ /*__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(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__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);
@@ -1571,7 +1571,7 @@
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
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__);
+ /*__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;
@@ -1581,7 +1581,7 @@
lt->reentrancy++;
}
if (!strcmp(filename, "asterisk.c")) {
- __ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);
+ /*__ast_mutex_logger("Global lock released by %s line %d (%s)\n", filename, line, func);*/
}
ast_reentrancy_unlock(lt);
ast_mark_lock_acquired(t);
More information about the asterisk-commits
mailing list