aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-10 17:56:12 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-10 17:56:12 +0000
commit6362602098bca4bee5289bea26706576e096ea83 (patch)
treea6088af76b6f3fef361c8e069b0a0590d970bf5d /apps
parent1c0f1de3202b97ed234b78dabbabe55af6c6b288 (diff)
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) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246122 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index db763d929..6794dc31a 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3351,6 +3351,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
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);
@@ -3422,7 +3423,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
}
/* 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",
@@ -3442,7 +3443,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ao2_ref(cur, -1);
ao2_unlock(qe->parent);
ao2_iterator_destroy(&memi);
- if (use_weight)
+ if (need_weight)
ao2_unlock(queues);
goto out;
}
@@ -3451,7 +3452,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
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;
@@ -3461,7 +3462,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
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;
@@ -3499,7 +3500,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
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;
@@ -3541,7 +3542,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
++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