xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/linux

This commit is contained in:
Shengliang Guan 2021-02-01 11:33:24 +08:00
parent 00916632b4 107bfc250e
commit 45f9177ec5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/src/tscSystem.c
View File

@ -64,7 +64,7 @@ void tscReleaseRpc(void *param) {
return; return;
} }
pthread_mutex_lock(&rpcObjMutex); pthread_mutex_lock(&rpcObjMutex);
taosCacheRelease(tscRpcCache, (void *)&param, false); taosCacheRelease(tscRpcCache, (void *)&param, true);
pthread_mutex_unlock(&rpcObjMutex); pthread_mutex_unlock(&rpcObjMutex);
} }
@ -215,7 +215,6 @@ void taos_cleanup(void) {
taosCloseRef(id); taosCloseRef(id);
taosCleanupKeywordsTable(); taosCleanupKeywordsTable();
taosCloseLog();
p = tscRpcCache; p = tscRpcCache;
tscRpcCache = NULL; tscRpcCache = NULL;
@ -225,7 +224,10 @@ void taos_cleanup(void) {
pthread_mutex_destroy(&rpcObjMutex); pthread_mutex_destroy(&rpcObjMutex);
} }
if (tscEmbedded == 0) rpcCleanup(); if (tscEmbedded == 0) {
rpcCleanup();
taosCloseLog();
};
p = tscTmr; p = tscTmr;
tscTmr = NULL; tscTmr = NULL;

7
src/rpc/src/rpcTcp.c
View File

@ -364,10 +364,11 @@ void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int numOfThread
} }
void taosStopTcpClient(void *chandle) { void taosStopTcpClient(void *chandle) {
SThreadObj *pThreadObj = chandle; SClientObj *pClientObj = chandle;
if (pThreadObj == NULL) return;
tDebug ("%s TCP client is stopped", pThreadObj->label); if (pClientObj == NULL) return;
tDebug ("%s TCP client is stopped", pClientObj->label);
} }
void taosCleanUpTcpClient(void *chandle) { void taosCleanUpTcpClient(void *chandle) {