From 29057328e6652a928dc0d7c050d15b2ea7fdd0c0 Mon Sep 17 00:00:00 2001 From: Yihao Deng Date: Mon, 19 Feb 2024 02:20:24 +0000 Subject: [PATCH] add trace log --- source/libs/transport/src/trans.c | 6 +----- source/libs/transport/src/transCli.c | 13 ++----------- source/libs/transport/src/transComm.c | 1 + 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c index 64302a78fc..f658947144 100644 --- a/source/libs/transport/src/trans.c +++ b/source/libs/transport/src/trans.c @@ -140,11 +140,7 @@ void* rpcMallocCont(int64_t contLen) { return start + sizeof(STransMsgHead); } -void rpcFreeCont(void* cont) { - if (cont == NULL) return; - taosMemoryFree((char*)cont - TRANS_MSG_OVERHEAD); - tTrace("rpc free cont:%p", (char*)cont - TRANS_MSG_OVERHEAD); -} +void rpcFreeCont(void* cont) { transFreeMsg(cont); } void* rpcReallocCont(void* ptr, int64_t contLen) { if (ptr == NULL) return rpcMallocCont(contLen); diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index b6942655a9..798a5bf54f 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -218,7 +218,6 @@ static void (*cliAsyncHandle[])(SCliMsg* pMsg, SCliThrd* pThrd) = {cliHandleReq, /// static void (*cliAsyncHandle[])(SCliMsg* pMsg, SCliThrd* pThrd) = {cliHandleReq, cliHandleQuit, cliHandleRelease, /// NULL,cliHandleUpdate}; -static FORCE_INLINE void destroyUserdata(STransMsg* userdata); static FORCE_INLINE void destroyCmsg(void* cmsg); static FORCE_INLINE void destroyCmsgAndAhandle(void* cmsg); static FORCE_INLINE int cliRBChoseIdx(STrans* pTransInst); @@ -1950,14 +1949,6 @@ _err: return NULL; } -static FORCE_INLINE void destroyUserdata(STransMsg* userdata) { - if (userdata->pCont == NULL) { - return; - } - transFreeMsg(userdata->pCont); - userdata->pCont = NULL; -} - static FORCE_INLINE void destroyCmsg(void* arg) { SCliMsg* pMsg = arg; if (pMsg == NULL) { @@ -1965,7 +1956,7 @@ static FORCE_INLINE void destroyCmsg(void* arg) { } transDestroyConnCtx(pMsg->ctx); - destroyUserdata(&pMsg->msg); + transFreeMsg(pMsg->msg.pCont); taosMemoryFree(pMsg); } @@ -1984,7 +1975,7 @@ static FORCE_INLINE void destroyCmsgAndAhandle(void* param) { tDebug("destroy Ahandle C"); transDestroyConnCtx(pMsg->ctx); - destroyUserdata(&pMsg->msg); + transFreeMsg(pMsg->msg.pCont); taosMemoryFree(pMsg); } diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c index b1fb9a2450..4619722743 100644 --- a/source/libs/transport/src/transComm.c +++ b/source/libs/transport/src/transComm.c @@ -87,6 +87,7 @@ void transFreeMsg(void* msg) { if (msg == NULL) { return; } + tTrace("rpc free cont:%p", (char*)msg - TRANS_MSG_OVERHEAD); taosMemoryFree((char*)msg - sizeof(STransMsgHead)); } int transSockInfo2Str(struct sockaddr* sockname, char* dst) {