[asterisk-commits] rmudgett: trunk r390940 - /trunk/bridges/bridge_softmix.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun  7 20:12:57 2013
New Revision: 390940

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390940
Log:
Add some bridge identifiers to some softmix messages.

Modified:
    trunk/bridges/bridge_softmix.c

Modified: trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/trunk/bridges/bridge_softmix.c?view=diff&rev=390940&r1=390939&r2=390940
==============================================================================
--- trunk/bridges/bridge_softmix.c (original)
+++ trunk/bridges/bridge_softmix.c Fri Jun  7 20:12:57 2013
@@ -844,7 +844,9 @@
 			 * all the memcpys used during this process depend on this assumption.  Rather
 			 * than checking this over and over again through out the code, this single
 			 * verification is done on each iteration. */
-			ast_log(LOG_WARNING, "Conference mixing error, requested mixing length greater than mixing buffer.\n");
+			ast_log(LOG_WARNING,
+				"Bridge %s: Conference mixing error, requested mixing length greater than mixing buffer.\n",
+				bridge->uniqueid);
 			goto softmix_cleanup;
 		}
 
@@ -944,7 +946,8 @@
 		/* Wait for the timing source to tell us to wake up and get things done */
 		ast_waitfor_n_fd(&timingfd, 1, &timeout, NULL);
 		if (ast_timer_ack(timer, 1) < 0) {
-			ast_log(LOG_ERROR, "Failed to acknowledge timer in softmix bridge.\n");
+			ast_log(LOG_ERROR, "Bridge %s: Failed to acknowledge timer in softmix.\n",
+				bridge->uniqueid);
 			ast_bridge_lock(bridge);
 			goto softmix_cleanup;
 		}
@@ -1080,6 +1083,10 @@
 	softmix_data->thread = AST_PTHREADT_NULL;
 	ast_mutex_unlock(&softmix_data->lock);
 	if (thread != AST_PTHREADT_NULL) {
+		/*
+		 * We cannot use bridge->uniqueid in the message because the
+		 * bridge pointer is likely a dummy from a deferred destruction.
+		 */
 		ast_debug(1, "Waiting for mixing thread to die.\n");
 		pthread_join(thread, NULL);
 	}