diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-10 00:20:46 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-10 00:20:46 +0000 |
| commit | 41eba63840fb697b1b31426934fc78f4d96f9fcb (patch) | |
| tree | c5a792e2b726be826a8525b4ae42cfcdb4eaa146 /bridges | |
| parent | e844969fbaa997e7050dba14a355c1267bed81af (diff) | |
Merged revisions 378854,378858-378859 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r378854 | rmudgett | 2013-01-09 17:22:00 -0600 (Wed, 09 Jan 2013) | 1 line
Fix logger.c function definition.
........
r378858 | rmudgett | 2013-01-09 17:23:41 -0600 (Wed, 09 Jan 2013) | 6 lines
Trivial misc bridge code changes.
* softmix_bridge_thread() was redundantly initializing an 8K buffer.
* Promoted a debug message to a warning in multiplexed_add_or_remove().
........
r378859 | rmudgett | 2013-01-09 17:51:45 -0600 (Wed, 09 Jan 2013) | 6 lines
* Simple optimization of bridge_playfile().
* Squeezed some redundancy out of update_bridge_vars().
* Wrapped long line in __ast_change_name_nolink().
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_multiplexed.c | 3 | ||||
| -rw-r--r-- | bridges/bridge_softmix.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bridges/bridge_multiplexed.c b/bridges/bridge_multiplexed.c index 432c7e277..bce93cef6 100644 --- a/bridges/bridge_multiplexed.c +++ b/bridges/bridge_multiplexed.c @@ -290,7 +290,8 @@ static void multiplexed_add_or_remove(struct multiplexed_thread *multiplexed_thr ao2_ref(multiplexed_thread, +1); if (ast_pthread_create(&multiplexed_thread->thread, NULL, multiplexed_thread_function, multiplexed_thread)) { ao2_ref(multiplexed_thread, -1); - ast_debug(1, "Failed to create an actual thread for multiplexed thread '%p', trying next time\n", multiplexed_thread); + ast_log(LOG_WARNING, "Failed to create the bridge thread for multiplexed thread '%p', trying next time\n", + multiplexed_thread); } } else if (!multiplexed_thread->service_count && multiplexed_thread->thread != AST_PTHREADT_NULL) { thread = multiplexed_thread->thread; diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 1a0b4fc18..a04388f4c 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -750,7 +750,7 @@ static int softmix_bridge_thread(struct ast_bridge *bridge) struct softmix_bridge_data *softmix_data = bridge->bridge_pvt; struct ast_timer *timer; struct softmix_translate_helper trans_helper; - int16_t buf[MAX_DATALEN] = { 0, }; + int16_t buf[MAX_DATALEN]; unsigned int stat_iteration_counter = 0; /* counts down, gather stats at zero and reset. */ int timingfd; int update_all_rates = 0; /* set this when the internal sample rate has changed */ |