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

add config

This commit is contained in:
yihaoDeng 2024-09-30 11:02:13 +08:00
parent c173f5ab02
commit adb8251bd6
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/libs/transport/src/transCli.c
View File

@ -1039,6 +1039,34 @@ _failed:
taosMemoryFree(conn); taosMemoryFree(conn);
return code; return code;
} }
static void cliDestroyAllQidFromThrd(SCliConn* conn) {
int32_t code = 0;
SCliThrd* pThrd = conn->hostThrd;
void* pIter = taosHashIterate(conn->pQTable, NULL);
while (pIter != NULL) {
int64_t* qid = taosHashGetKey(pIter, NULL);
code = taosHashRemove(pThrd->pIdConnTable, qid, sizeof(*qid));
if (code != 0) {
tDebug("%s conn %p failed to remove state %" PRId64 " since %s", CONN_GET_INST_LABEL(conn), conn, *qid,
tstrerror(code));
} else {
tDebug("%s conn %p destroy state %" PRId64 "", CONN_GET_INST_LABEL(conn), conn, *qid);
}
STransCtx* ctx = pIter;
transCtxCleanup(ctx);
transReleaseExHandle(transGetRefMgt(), *qid);
transRemoveExHandle(transGetRefMgt(), *qid);
pIter = taosHashIterate(conn->pQTable, pIter);
}
taosHashCleanup(conn->pQTable);
conn->pQTable = NULL;
}
static void cliDestroyConn(SCliConn* conn, bool clear) { cliHandleException(conn); } static void cliDestroyConn(SCliConn* conn, bool clear) { cliHandleException(conn); }
static void cliDestroy(uv_handle_t* handle) { static void cliDestroy(uv_handle_t* handle) {
int32_t code = 0; int32_t code = 0;
@ -1061,20 +1089,7 @@ static void cliDestroy(uv_handle_t* handle) {
taosMemoryFree(conn->dstAddr); taosMemoryFree(conn->dstAddr);
taosMemoryFree(conn->stream); taosMemoryFree(conn->stream);
taosMemoryFree(conn->ipStr); taosMemoryFree(conn->ipStr);
cliDestroyAllQidFromThrd(conn);
void* pIter = taosHashIterate(conn->pQTable, NULL);
while (pIter) {
int64_t* qid = taosHashGetKey(pIter, NULL);
code = taosHashRemove(pThrd->pIdConnTable, qid, sizeof(*qid));
if (code != 0) {
tDebug("%s conn %p failed to remove state %" PRId64 " since %s", CONN_GET_INST_LABEL(conn), conn, *qid,
tstrerror(code));
}
pIter = taosHashIterate(conn->pQTable, pIter);
tDebug("%s conn %p destroy state %" PRId64 "", CONN_GET_INST_LABEL(conn), conn, *qid);
}
destroyCliConnQTable(conn);
if (conn->pInitUserReq) { if (conn->pInitUserReq) {
taosMemoryFree(conn->pInitUserReq); taosMemoryFree(conn->pInitUserReq);
@ -1149,7 +1164,9 @@ static void cliHandleException(SCliConn* conn) {
tError("%s conn %p failed to destroy all reqs on conn since %s", CONN_GET_INST_LABEL(conn), conn, tstrerror(code)); tError("%s conn %p failed to destroy all reqs on conn since %s", CONN_GET_INST_LABEL(conn), conn, tstrerror(code));
} }
cliDestroyAllQidFromThrd(conn);
QUEUE_REMOVE(&conn->q); QUEUE_REMOVE(&conn->q);
if (conn->registered) { if (conn->registered) {
int8_t ref = transGetRefCount(conn); int8_t ref = transGetRefCount(conn);
if (ref == 0 && !uv_is_closing((uv_handle_t*)conn->stream)) { if (ref == 0 && !uv_is_closing((uv_handle_t*)conn->stream)) {