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

Merged revisions 138687 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r138687 | mmichelson | 2008-08-18 15:04:10 -0500 (Mon, 18 Aug 2008) | 18 lines

Merged revisions 138685 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-08-18 20:05:09 +00:00
parent 133e628462
commit ac72baa7b5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_queue.c
View File

@@ -2810,7 +2810,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
break; break;
/* If we have timed out, break out */ /* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) { if (qe->expire && (time(NULL) >= qe->expire)) {
*reason = QUEUE_TIMEOUT; *reason = QUEUE_TIMEOUT;
break; break;
} }
@@ -2845,7 +2845,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
break; break;
/* If we have timed out, break out */ /* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) { if (qe->expire && (time(NULL) >= qe->expire)) {
*reason = QUEUE_TIMEOUT; *reason = QUEUE_TIMEOUT;
break; break;
} }
@@ -2856,12 +2856,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
break; break;
/* see if we need to move to the next penalty level for this queue */ /* see if we need to move to the next penalty level for this queue */
while (qe->pr && ((time(NULL) - qe->start) > qe->pr->time)) { while (qe->pr && ((time(NULL) - qe->start) >= qe->pr->time)) {
update_qe_rule(qe); update_qe_rule(qe);
} }
/* If we have timed out, break out */ /* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) { if (qe->expire && (time(NULL) >= qe->expire)) {
*reason = QUEUE_TIMEOUT; *reason = QUEUE_TIMEOUT;
break; break;
} }
@@ -2875,7 +2875,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
} }
/* If we have timed out, break out */ /* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) { if (qe->expire && (time(NULL) >= qe->expire)) {
*reason = QUEUE_TIMEOUT; *reason = QUEUE_TIMEOUT;
break; break;
} }
@@ -3200,7 +3200,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
* This should be extremely rare. queue_exec will take care * This should be extremely rare. queue_exec will take care
* of removing the caller and reporting the timeout as the reason. * of removing the caller and reporting the timeout as the reason.
*/ */
if (qe->expire && now > qe->expire) { if (qe->expire && now >= qe->expire) {
res = 0; res = 0;
goto out; goto out;
} }
@@ -4637,7 +4637,7 @@ check_turns:
enum queue_member_status stat; enum queue_member_status stat;
/* Leave if we have exceeded our queuetimeout */ /* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) > qe.expire)) { if (qe.expire && (time(NULL) >= qe.expire)) {
record_abandoned(&qe); record_abandoned(&qe);
reason = QUEUE_TIMEOUT; reason = QUEUE_TIMEOUT;
res = 0; res = 0;
@@ -4660,7 +4660,7 @@ check_turns:
goto stop; goto stop;
/* Leave if we have exceeded our queuetimeout */ /* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) > qe.expire)) { if (qe.expire && (time(NULL) >= qe.expire)) {
record_abandoned(&qe); record_abandoned(&qe);
reason = QUEUE_TIMEOUT; reason = QUEUE_TIMEOUT;
res = 0; res = 0;
@@ -4716,7 +4716,7 @@ check_turns:
} }
/* Leave if we have exceeded our queuetimeout */ /* Leave if we have exceeded our queuetimeout */
if (qe.expire && (time(NULL) > qe.expire)) { if (qe.expire && (time(NULL) >= qe.expire)) {
record_abandoned(&qe); record_abandoned(&qe);
reason = QUEUE_TIMEOUT; reason = QUEUE_TIMEOUT;
res = 0; res = 0;