test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-03 12:28:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

there's one bug in acl_aqueue_pop_timedwait when computing timeout for waiting

Browse Source
This commit is contained in:
zhengshuxin 2017-08-29 17:46:41 +08:00
parent 85b55d4e4e
commit 3191bf51db
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib_acl/changes.txt
View File

@ -3,6 +3,7 @@
------------------------------------------------------------------------ ------------------------------------------------------------------------
605) 2017.8.29 605) 2017.8.29
605.1) feature: acl_mbox.c 中的 acl_mbox_read 函数读超时单位由秒级调整为毫秒级 605.1) feature: acl_mbox.c 中的 acl_mbox_read 函数读超时单位由秒级调整为毫秒级
605.2) bugfix: acl_aqueue.c 中的 acl_aqueue_pop_timedwait 函数计算超时时间方式有误
604) 2017.8.15 604) 2017.8.15
604.1) feature: 开放 acl_read_xxx_wait 接口，以允许毫秒级读超时等待 604.1) feature: 开放 acl_read_xxx_wait 接口，以允许毫秒级读超时等待

22
lib_acl/src/msg/acl_aqueue.c
View File

@ -144,19 +144,19 @@ void *acl_aqueue_pop(ACL_AQUEUE *queue)
return (acl_aqueue_pop_timedwait(queue, -1, -1)); return (acl_aqueue_pop_timedwait(queue, -1, -1));
} }
static int aqueue_wait(ACL_AQUEUE *queue, const struct timespec *ptimeout) static int aqueue_wait(ACL_AQUEUE *queue, const struct timespec *ptimeo)
{ {
const char *myname = "aqueue_wait"; const char *myname = "aqueue_wait";
int status; int status;
while (queue->first == NULL && queue->quit == 0) { while (queue->first == NULL && queue->quit == 0) {
if (ptimeout != NULL) if (ptimeo != NULL)
status = acl_pthread_cond_timedwait(&queue->cond, status = acl_pthread_cond_timedwait(&queue->cond,
&queue->lock, ptimeout); &queue->lock, ptimeo);
else else
status = acl_pthread_cond_wait(&queue->cond, &queue->lock); status = acl_pthread_cond_wait(&queue->cond, &queue->lock);
if (ptimeout && status == ACL_ETIMEDOUT) { if (ptimeo && status == ACL_ETIMEDOUT) {
status = acl_pthread_mutex_unlock(&queue->lock); status = acl_pthread_mutex_unlock(&queue->lock);
if (status != 0) if (status != 0)
acl_msg_error("%s(%d): unlock error(%s)", acl_msg_error("%s(%d): unlock error(%s)",
@ -186,7 +186,7 @@ void *acl_aqueue_pop_timedwait(ACL_AQUEUE *queue, int tmo_sec, int tmo_usec)
const char *myname = "acl_aqueue_pop_timedwait"; const char *myname = "acl_aqueue_pop_timedwait";
ACL_AQUEUE_ITEM *qi; ACL_AQUEUE_ITEM *qi;
struct timeval tv; struct timeval tv;
struct timespec timeout, *ptimeout; struct timespec timeo, *ptimeo;
int status; int status;
void *data; void *data;
@ -207,15 +207,17 @@ void *acl_aqueue_pop_timedwait(ACL_AQUEUE *queue, int tmo_sec, int tmo_usec)
while (1) { while (1) {
if (tmo_sec < 0 || tmo_usec < 0) if (tmo_sec < 0 || tmo_usec < 0)
ptimeout = NULL; ptimeo = NULL;
else { else {
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
timeout.tv_sec = tv.tv_sec + tmo_sec; timeo.tv_sec = tv.tv_sec + tmo_sec;
timeout.tv_nsec = tv.tv_usec * 1000 + tmo_usec * 1000; timeo.tv_nsec = tv.tv_usec * 1000 + tmo_usec * 1000;
ptimeout = &timeout; timeo.tv_sec += timeo.tv_nsec / 1000000000;
timeo.tv_nsec %= 1000000000;
ptimeo = &timeo;
} }
if (aqueue_wait(queue, ptimeout) < 0) if (aqueue_wait(queue, ptimeo) < 0)
return NULL; return NULL;
qi = queue->first; qi = queue->first;