Author: dvossel
Date: Wed Feb 10 11:51:34 2010
New Revision: 246117
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246117
Log:
Merged revisions 246116 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r246116 | dvossel | 2010-02-10 11:49:34 -0600 (Wed, 10 Feb 2010) | 14 lines
Merged revisions 246115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r246115 | dvossel | 2010-02-10 11:44:20 -0600 (Wed, 10 Feb 2010) | 8 lines
fixes random deadlock in app_queue with use_weight during reload
(closes issue #16677)
Reported by: tim_ringenbach
Patches:
app_queue_use_weight_deadlock.diff uploaded by tim ringenbach (license 540)
........
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/apps/app_queue.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=246117&r1=246116&r2=246117
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Wed Feb 10 11:51:34 2010
@@ -3605,6 +3605,7 @@
struct ao2_iterator memi;
struct ast_datastore *datastore, *transfer_ds;
struct queue_end_bridge *queue_end_bridge = NULL;
+ const int need_weight = use_weight;
ast_channel_lock(qe->chan);
datastore = ast_channel_datastore_find(qe->chan, &dialed_interface_info, NULL);
@@ -3686,7 +3687,7 @@
}
/* Hold the lock while we setup the outgoing calls */
- if (use_weight)
+ if (need_weight)
ao2_lock(queues);
ao2_lock(qe->parent);
ast_debug(1, "%s is trying to call a queue member.\n",
@@ -3706,7 +3707,7 @@
ao2_ref(cur, -1);
ao2_unlock(qe->parent);
ao2_iterator_destroy(&memi);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
goto out;
}
@@ -3715,7 +3716,7 @@
ao2_ref(cur, -1);
ao2_unlock(qe->parent);
ao2_iterator_destroy(&memi);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
free(tmp);
goto out;
@@ -3725,7 +3726,7 @@
ao2_ref(cur, -1);
ao2_unlock(&qe->parent);
ao2_iterator_destroy(&memi);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
free(tmp);
goto out;
@@ -3763,7 +3764,7 @@
ao2_ref(cur, -1);
ao2_unlock(qe->parent);
ao2_iterator_destroy(&memi);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
free(tmp);
goto out;
@@ -3819,7 +3820,7 @@
++qe->pending;
ao2_unlock(qe->parent);
ring_one(qe, outgoing, &numbusies);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
lpeer = wait_for_answer(qe, outgoing, &to, &digit, numbusies, ast_test_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT), forwardsallowed);
/* The ast_channel_datastore_remove() function could fail here if the