diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-06-08 01:12:57 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-08 01:12:57 +0000 |
commit | 6a013e3a07afd95ee9701ee6be30e955d8cf9af0 (patch) | |
tree | 859810de0741ea1e9703b9de381c0e0ed033371f /bridges | |
parent | ed3f65ef9672ce47c549c08fdfcab708eb4e091f (diff) |
Add some bridge identifiers to some softmix messages.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/bridge_softmix.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 4583435a0..c1b3618c9 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -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 * 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 @@ static int softmix_mixing_loop(struct ast_bridge *bridge) /* 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 @@ static void softmix_bridge_destroy(struct ast_bridge *bridge) 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); } |