From 95fec9e4a9228aac09338899d0fde8ca9a388a97 Mon Sep 17 00:00:00 2001 From: deffpuzzl Date: Thu, 21 Jun 2018 12:55:51 +0800 Subject: [PATCH] fix unload from queue and multithread process --- include/tmain.h | 2 +- src/queue.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/tmain.h b/include/tmain.h index 9038209..85a16c1 100644 --- a/include/tmain.h +++ b/include/tmain.h @@ -39,7 +39,7 @@ typedef long (*FUNCEXEC)(SATvm *pstSavm, void *arg); #define MAX_CON_EVENTS 65535 #define TVM_PORT_LISTEN 1801 #define TVM_PORT_DOMAIN 1800 -#define MAX_LOCK_TIME 1800 +#define MAX_LOCK_TIME 600 #define TVM_LOCAL_SERV "LIS.tvm" #define TVM_REMOTE_DOM "RDS.tvm" #define LOCAL_HOST_IP "127.0.0.1" diff --git a/src/queue.c b/src/queue.c index 33fbb3e..866c1d4 100644 --- a/src/queue.c +++ b/src/queue.c @@ -332,8 +332,7 @@ long lTimePop(SATvm *pstSavm, void *pvOut, Uenum eWait) return _lPopByRt(pstSavm, pvOut); } -// if(QUE_NORMAL == eWait) tm.tv_sec = MAX_LOCK_TIME; - if(QUE_NORMAL == eWait) tm.tv_sec = 5; + if(QUE_NORMAL == eWait) tm.tv_sec = MAX_LOCK_TIME; lRet = _lPop(pstSavm, pstRun->m_pvAddr, pvOut, &tm); vTblDisconnect(pstSavm, pstSavm->tblName); return lRet;