kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some bridge identifiers to some softmix messages.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-06-08 01:12:57 +00:00
parent ed3f65ef96
commit 6a013e3a07
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bridges/bridge_softmix.c
View File

@@ -844,7 +844,9 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
* all the memcpys used during this process depend on this assumption. Rather * 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 * than checking this over and over again through out the code, this single
* verification is done on each iteration. */ * 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; goto softmix_cleanup;
} }
@@ -944,7 +946,8 @@ static int softmix_mixing_loop(struct ast_bridge *bridge)
/* Wait for the timing source to tell us to wake up and get things done */ /* Wait for the timing source to tell us to wake up and get things done */
ast_waitfor_n_fd(&timingfd, 1, &timeout, NULL); ast_waitfor_n_fd(&timingfd, 1, &timeout, NULL);
if (ast_timer_ack(timer, 1) < 0) { 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); ast_bridge_lock(bridge);
goto softmix_cleanup; goto softmix_cleanup;
} }
@@ -1080,6 +1083,10 @@ static void softmix_bridge_destroy(struct ast_bridge *bridge)
softmix_data->thread = AST_PTHREADT_NULL; softmix_data->thread = AST_PTHREADT_NULL;
ast_mutex_unlock(&softmix_data->lock); ast_mutex_unlock(&softmix_data->lock);
if (thread != AST_PTHREADT_NULL) { 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"); ast_debug(1, "Waiting for mixing thread to die.\n");
pthread_join(thread, NULL); pthread_join(thread, NULL);
} }