diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-07 20:14:52 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-07 20:14:52 +0000 |
| commit | 88de778e4c6381b9e88f5e377eb8ba17d8fe34bc (patch) | |
| tree | 9e0e6c9d09c4e4d18d6083b4d7d21dff4309f7f9 | |
| parent | 428e03cb95f10824ec2967c9c3cc32147ffae179 (diff) | |
Merged revisions 211113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r211113 | russell | 2009-08-07 15:12:21 -0500 (Fri, 07 Aug 2009) | 11 lines
Recorded merge of revisions 211112 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r211112 | russell | 2009-08-07 15:11:31 -0500 (Fri, 07 Aug 2009) | 4 lines
Resolve a deadlock involving app_chanspy and masquerades.
(ABE-1936)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@211114 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_chanspy.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 4c1bf0e4b..92903e3d5 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -455,17 +455,20 @@ static const struct ast_datastore_info chanspy_ds_info = { static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds) { - if (!chanspy_ds) + struct ast_channel *chan; + + if (!chanspy_ds) { return NULL; + } ast_mutex_lock(&chanspy_ds->lock); - if (chanspy_ds->chan) { + while ((chan = chanspy_ds->chan)) { struct ast_datastore *datastore; - struct ast_channel *chan; - chan = chanspy_ds->chan; - - ast_channel_lock(chan); + if (ast_channel_trylock(chan)) { + DEADLOCK_AVOIDANCE(&chanspy_ds->lock); + continue; + } if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, chanspy_ds->unique_id))) { ast_channel_datastore_remove(chan, datastore); /* chanspy_ds->chan is NULL after this call */ @@ -474,6 +477,7 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds) ast_channel_datastore_free(datastore); } ast_channel_unlock(chan); + break; } ast_mutex_unlock(&chanspy_ds->lock); |