summaryrefslogtreecommitdiff
path: root/include/asterisk/taskprocessor.h
diff options
context:
space:
mode:
authorAutomerge script <automerge@asterisk.org>2012-12-07 00:19:29 +0000
committerAutomerge script <automerge@asterisk.org>2012-12-07 00:19:29 +0000
commit62981d203221541829b7d6165e2127ca9a29efd4 (patch)
tree38fcffe465c2ab81383802a6f517008ab77481c2 /include/asterisk/taskprocessor.h
parent944540292567f0349bd465bd5ae86ff114364ad1 (diff)
Merged revisions 377356 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk ................ r377356 | rmudgett | 2012-12-06 18:00:39 -0600 (Thu, 06 Dec 2012) | 30 lines confbridge: Fix some resource leaks on conference teardown. * Made destroy_conference_bridge() destroy a missed ast_mutex_t and ast_cond_t. * Made join_conference_bridge() init the ast_mutex_t's and ast_cond_t so destroy_conference_bridge() can destroy them unconditionally. * Made join_conference_bridge() abort if the new conference could not be added to the conferences container. * Made leave_conference() discard any post-join actions if join_conference_bridge() had to abort early. * Made the join_conference_bridge() diagnostic messages better describe what happened. * Renamed leave_conference_bridge() to leave_conference() and made it only take a conference user pointer. The conference pointer was redundant. * Made conf_bridge_profile_copy() use struct copy instead of memcpy(). * No need to lock the conference in start_conf_record_thread() since all of the callers already have it locked. ........ Merged revisions 377354 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 377355 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/taskprocessor.h')
0 files changed, 0 insertions, 0 deletions