You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Vossel df0f9b43ff Merged revisions 259870 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/trunk ................ r259870 | dvossel | 2010-04-28 16:20:03 -0500 (Wed, 28 Apr 2010) | 39 lines Merged revisions 259858 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259858 | dvossel | 2010-04-28 16:16:03 -0500 (Wed, 28 Apr 2010) | 33 lines resolves deadlocks in chan_local Issue_1. In the local_hangup() 3 locks must be held at the same time... pvt, pvt->chan, and pvt->owner. Proper deadlock avoidance is done when the channel to hangup is the outbound chan_local channel, but when it is not the outbound channel we have an issue... We attempt to do deadlock avoidance only on the tech pvt, when both the tech pvt and the pvt->owner are locked coming into that loop. By never giving up the pvt->owner channel deadlock avoidance is not entirely possible. This patch resolves that by doing deadlock avoidance on both the pvt->owner and the pvt when trying to get the pvt->chan lock. Issue_2. ast_prod() is used in ast_activate_generator() to queue a frame on the channel and make the channel's read function get called. This function is used in ast_activate_generator() while the channel is locked, which mean's the channel will have a lock both from the generator code and the frame_queue code by the time it gets to chan_local.c's local_queue_frame code... local_queue_frame contains some of the same crazy deadlock avoidance that local_hangup requires, and this recursive lock prevents that deadlock avoidance from happening correctly. This patch removes ast_prod() from the channel lock so only one lock is held during the local_queue_frame function. (closes issue #17185) Reported by: schmoozecom Patches: issue_17185_v1.diff uploaded by dvossel (license 671) issue_17185_v2.diff uploaded by dvossel (license 671) Tested by: schmoozecom, GameGamer43 Review: https://reviewboard.asterisk.org/r/631/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@259930 65c4cc65-6c06-0410-ace0-fbb531ad65f3		16 years ago
..
db1-ast	…
editline	…
stdtime	…
Makefile	…
abstract_jb.c	…
acl.c	…
adsistub.c	…
aescrypt.c	…
aeskey.c	…
aesopt.h	…
aestab.c	…
alaw.c	…
app.c	…
ast_expr2.c	…
ast_expr2.fl	…
ast_expr2.h	…
ast_expr2.y	…
ast_expr2f.c	…
asterisk.c	…
astfd.c	…
astmm.c	…
astobj2.c	…
audiohook.c	…
autoservice.c	…
buildinfo.c	…
callerid.c	…
cdr.c	…
channel.c	Merged revisions 259870 via svnmerge from	16 years ago
chanvars.c	…
cli.c	…
config.c	…
cryptostub.c	…
cygload.c	…
datastore.c	…
db.c	…
devicestate.c	…
dial.c	…
dns.c	…
dnsmgr.c	…
dsp.c	…
ecdisa.h	…
enum.c	…
event.c	…
features.c	…
file.c	…
fixedjitterbuf.c	…
fixedjitterbuf.h	…
frame.c	…
fskmodem.c	…
fskmodem_float.c	…
fskmodem_int.c	…
global_datastores.c	…
hashtab.c	…
heap.c	…
http.c	…
image.c	…
indications.c	…
io.c	…
jitterbuf.c	…
loader.c	…
logger.c	…
manager.c	…
md5.c	…
netsock.c	…
pbx.c	…
plc.c	…
poll.c	…
privacy.c	…
rtp.c	…
say.c	…
sched.c	…
sha1.c	…
slinfactory.c	…
srv.c	…
ssl.c	…
strcompat.c	…
taskprocessor.c	…
tcptls.c	…
tdd.c	…
term.c	…
threadstorage.c	…
timing.c	…
translate.c	…
udptl.c	…
ulaw.c	…
utils.c	…