[asterisk-commits] tilghman: branch tilghman/better_backtrace_1.4 r298056 - in /team/tilghman/be...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Dec 10 10:54:29 2010
New Revision: 298056

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298056
Log:
Revert unrelated changes and a test

Modified:
    team/tilghman/better_backtrace_1.4/apps/app_sayunixtime.c
    team/tilghman/better_backtrace_1.4/main/devicestate.c
    team/tilghman/better_backtrace_1.4/pbx/pbx_dundi.c

Modified: team/tilghman/better_backtrace_1.4/apps/app_sayunixtime.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/better_backtrace_1.4/apps/app_sayunixtime.c?view=diff&rev=298056&r1=298055&r2=298056
==============================================================================
--- team/tilghman/better_backtrace_1.4/apps/app_sayunixtime.c (original)
+++ team/tilghman/better_backtrace_1.4/apps/app_sayunixtime.c Fri Dec 10 10:54:29 2010
@@ -85,8 +85,6 @@
 
 	u = ast_module_user_add(chan);
 
-	ast_backtrace();
-
 	AST_STANDARD_APP_ARGS(args, parse);
 
 	ast_get_time_t(args.timeval, &unixtime, time(NULL), NULL);

Modified: team/tilghman/better_backtrace_1.4/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/better_backtrace_1.4/main/devicestate.c?view=diff&rev=298056&r1=298055&r2=298056
==============================================================================
--- team/tilghman/better_backtrace_1.4/main/devicestate.c (original)
+++ team/tilghman/better_backtrace_1.4/main/devicestate.c Fri Dec 10 10:54:29 2010
@@ -83,16 +83,7 @@
 
 /*! \brief The state change queue. State changes are queued
 	for processing by a separate thread */
-#ifndef AST_MUTEX_INIT_W_CONSTRUCTORS
 static AST_LIST_HEAD_STATIC(state_changes, state_change);
-#else
-static AST_LIST_HEAD(state_changes, state_change) state_changes;
-static pthread_once_t state_changes_once = PTHREAD_ONCE_INIT;
-static void state_changes_init(void)
-{
-	AST_LIST_HEAD_INIT(&state_changes);
-}
-#endif
 
 /*! \brief The device state change notification thread */
 static pthread_t change_thread = AST_PTHREADT_NULL;
@@ -317,9 +308,6 @@
 	} else {
 		/* queue the change */
 		strcpy(change->device, device);
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
-		pthread_once(&state_changes_once, state_changes_init);
-#endif
 		AST_LIST_LOCK(&state_changes);
 		AST_LIST_INSERT_TAIL(&state_changes, change, list);
 		if (AST_LIST_FIRST(&state_changes) == change)
@@ -347,9 +335,6 @@
 static void *do_devstate_changes(void *data)
 {
 	struct state_change *cur;
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
-	pthread_once(&state_changes_once, state_changes_init);
-#endif
 
 	AST_LIST_LOCK(&state_changes);
 	for(;;) {

Modified: team/tilghman/better_backtrace_1.4/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/better_backtrace_1.4/pbx/pbx_dundi.c?view=diff&rev=298056&r1=298055&r2=298056
==============================================================================
--- team/tilghman/better_backtrace_1.4/pbx/pbx_dundi.c (original)
+++ team/tilghman/better_backtrace_1.4/pbx/pbx_dundi.c Fri Dec 10 10:54:29 2010
@@ -262,13 +262,8 @@
 	AST_LIST_ENTRY(dundi_peer) list;
 };
 
-#ifndef AST_MUTEX_INIT_W_CONSTRUCTORS
 static AST_LIST_HEAD_STATIC(peers, dundi_peer);
 static AST_LIST_HEAD_STATIC(pcq, dundi_precache_queue);
-#else
-static AST_LIST_HEAD(peers, dundi_peer) peers;
-static AST_LIST_HEAD(pcq, dundi_precache_queue) pcq;
-#endif
 static AST_LIST_HEAD_NOLOCK_STATIC(mappings, dundi_mapping);
 static AST_LIST_HEAD_NOLOCK_STATIC(requests, dundi_request);
 static AST_LIST_HEAD_NOLOCK_STATIC(alltrans, dundi_transaction);
@@ -4614,11 +4609,6 @@
 	mark_peers();
 	prune_peers();
 
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
-	ast_mutex_destroy(&peers.lock);
-	ast_mutex_destroy(&pcq.lock);
-#endif
-
 	return 0;
 }
 
@@ -4633,11 +4623,6 @@
 {
 	int res = 0;
 	struct sockaddr_in sin;
-
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
-	ast_mutex_init(&peers.lock);
-	ast_mutex_init(&pcq.lock);
-#endif
 
 	dundi_set_output(dundi_debug_output);
 	dundi_set_error(dundi_error_output);