zcy
/
firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix unload from queue and multithread process

beta
deffpuzzl 2018-06-21 12:55:51 +08:00
parent 221404ec87
commit 95fec9e4a9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/tmain.h
View File

@ -39,7 +39,7 @@ typedef long (*FUNCEXEC)(SATvm *pstSavm, void *arg);
#define MAX_CON_EVENTS 65535 #define MAX_CON_EVENTS 65535
#define TVM_PORT_LISTEN 1801 #define TVM_PORT_LISTEN 1801
#define TVM_PORT_DOMAIN 1800 #define TVM_PORT_DOMAIN 1800
#define MAX_LOCK_TIME 1800 #define MAX_LOCK_TIME 600
#define TVM_LOCAL_SERV "LIS.tvm" #define TVM_LOCAL_SERV "LIS.tvm"
#define TVM_REMOTE_DOM "RDS.tvm" #define TVM_REMOTE_DOM "RDS.tvm"
#define LOCAL_HOST_IP "127.0.0.1" #define LOCAL_HOST_IP "127.0.0.1"

3
src/queue.c
View File

@ -332,8 +332,7 @@ long lTimePop(SATvm *pstSavm, void *pvOut, Uenum eWait)
return _lPopByRt(pstSavm, pvOut); return _lPopByRt(pstSavm, pvOut);
} }
// if(QUE_NORMAL == eWait) tm.tv_sec = MAX_LOCK_TIME; if(QUE_NORMAL == eWait) tm.tv_sec = MAX_LOCK_TIME;
if(QUE_NORMAL == eWait) tm.tv_sec = 5;
lRet = _lPop(pstSavm, pstRun->m_pvAddr, pvOut, &tm); lRet = _lPop(pstSavm, pstRun->m_pvAddr, pvOut, &tm);
vTblDisconnect(pstSavm, pstSavm->tblName); vTblDisconnect(pstSavm, pstSavm->tblName);
return lRet; return lRet;