kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 06:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix queue stuff (bug #3797)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-19 17:35:59 +00:00
parent 1205aaa664
commit 860eb98007
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
apps/app_queue.c
View File

@@ -746,35 +746,33 @@ static int update_dial_status(struct ast_call_queue *q, struct member *member, i
return update_status(q, member, status); return update_status(q, member, status);
} }
static int compare_weight(struct ast_call_queue *req_q, struct localuser *req_user, char *qname) static int compare_weight(struct ast_call_queue *rq, struct member *member)
{ {
/* traverse all defined queues which have calls waiting and contain this member /* traverse all defined queues which have calls waiting and contain this member
return 0 if no other queue has precedence (higher weight) or 1 if found */ return 0 if no other queue has precedence (higher weight) or 1 if found */
struct ast_call_queue *q; struct ast_call_queue *q;
struct member *mem; struct member *mem;
int found = 0, weight = 0, calls = 0; int found = 0;
char name[80] = "";
strncpy(name, req_q->name, sizeof(name) - 1);
weight = req_q->weight;
calls = req_q->count;
/* avoid deadlock which can occur under specific condition.
* another queue-walking func may be waiting for rq->lock, which
* was set by try_calling, but won't unlock til this finishes,
* yet we're waiting for &qlock. happy fun times! */
ast_mutex_unlock(&rq->lock);
ast_mutex_lock(&qlock); ast_mutex_lock(&qlock);
for (q = queues; q; q = q->next) { /* spin queues */ ast_mutex_lock(&rq->lock);
ast_mutex_lock(&q->lock); for (q = queues; q; q = q->next) {
if (!strcasecmp(q->name, name)) { /* don't check myself */ if (q == rq) /* don't check myself */
ast_mutex_unlock(&q->lock);
continue; continue;
} ast_mutex_lock(&q->lock);
if (q->count && q->members) { /* check only if calls waiting and has members */ if (q->count && q->members) {
for (mem = q->members; mem; mem = mem->next) { /* spin members */ for (mem = q->members; mem; mem = mem->next) {
if (!strcasecmp(mem->interface, req_user->interface)) { if (mem == member) {
ast_log(LOG_DEBUG, "Found matching member %s in queue '%s'\n", mem->interface, q->name); ast_log(LOG_DEBUG, "Found matching member %s in queue '%s'\n", mem->interface, q->name);
if (q->weight > weight) { if (q->weight > rq->weight) {
ast_log(LOG_DEBUG, "Queue '%s' (weight %d, calls %d) is preferred over '%s' (weight %d, calls %d)\n", q->name, q->weight, q->count, name, weight, calls); ast_log(LOG_DEBUG, "Queue '%s' (weight %d, calls %d) is preferred over '%s' (weight %d, calls %d)\n", q->name, q->weight, q->count, rq->name, rq->weight, rq->count);
found = 1; found = 1;
strncpy(qname, q->name, sizeof(qname) - 1); break;
break; /* stop looking for more members */
} }
} }
} }
@@ -795,18 +793,7 @@ static int ring_entry(struct queue_ent *qe, struct localuser *tmp, int *busies)
int status; int status;
char tech[256]; char tech[256];
char *location; char *location;
char qname[80] = "";
if (use_weight) { /* fast path */
if (compare_weight(qe->parent,tmp,qname)) {
ast_verbose(VERBOSE_PREFIX_3 "Attempt (%s: %s) delayed by higher priority queue (%s).\n", qe->parent->name, tmp->interface, qname);
if (qe->chan->cdr)
ast_cdr_busy(qe->chan->cdr);
tmp->stillgoing = 0;
(*busies)++;
return 0;
}
}
if (qe->parent->wrapuptime && (time(NULL) - tmp->lastcall < qe->parent->wrapuptime)) { if (qe->parent->wrapuptime && (time(NULL) - tmp->lastcall < qe->parent->wrapuptime)) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Wrapuptime not yet expired for %s\n", tmp->interface); ast_log(LOG_DEBUG, "Wrapuptime not yet expired for %s\n", tmp->interface);
@@ -825,6 +812,14 @@ static int ring_entry(struct queue_ent *qe, struct localuser *tmp, int *busies)
tmp->stillgoing = 0; tmp->stillgoing = 0;
return 0; return 0;
} }
if (use_weight && compare_weight(qe->parent,tmp->member)) {
ast_log(LOG_DEBUG, "Priority queue delaying call to %s:%s\n", qe->parent->name, tmp->interface);
if (qe->chan->cdr)
ast_cdr_busy(qe->chan->cdr);
tmp->stillgoing = 0;
(*busies)++;
return 0;
}
strncpy(tech, tmp->interface, sizeof(tech) - 1); strncpy(tech, tmp->interface, sizeof(tech) - 1);
if ((location = strchr(tech, '/'))) if ((location = strchr(tech, '/')))