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

Merge pull request #4035 from taosdata/feature/race 

link list bug
This commit is contained in:
Shengliang Guan 2020-10-29 08:31:55 +08:00 committed by GitHub
parent d4d133056b c90ec0d712
commit e4e544d2b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,11 @@ static void rpcUnlockConn(SRpcConn *pConn);
static void rpcAddRef(SRpcInfo *pRpc); static void rpcAddRef(SRpcInfo *pRpc);
static void rpcDecRef(SRpcInfo *pRpc); static void rpcDecRef(SRpcInfo *pRpc);
static void rpcFree(void *p) {
tTrace("free mem: %p", p);
free(p);
}
static void rpcInit(void) { static void rpcInit(void) {
tsProgressTimer = tsRpcTimer/2; tsProgressTimer = tsRpcTimer/2;
@ -222,7 +227,7 @@ static void rpcInit(void) {
tsRpcHeadSize = RPC_MSG_OVERHEAD; tsRpcHeadSize = RPC_MSG_OVERHEAD;
tsRpcOverhead = sizeof(SRpcReqContext); tsRpcOverhead = sizeof(SRpcReqContext);
tsRpcRefId = taosOpenRef(200, free); tsRpcRefId = taosOpenRef(200, rpcFree);
} }
void *rpcOpen(const SRpcInit *pInit) { void *rpcOpen(const SRpcInit *pInit) {

13
src/util/src/tref.c
View File

@ -159,8 +159,8 @@ int taosAddRef(int refId, void *p)
taosLockList(pSet->lockedBy+hash); taosLockList(pSet->lockedBy+hash);
pNode = pSet->nodeList[hash]; pNode = pSet->nodeList[hash];
while ( pNode ) { while (pNode) {
if ( pNode->p == p ) if (pNode->p == p)
break; break;
pNode = pNode->next; pNode = pNode->next;
@ -176,8 +176,9 @@ int taosAddRef(int refId, void *p)
pNode->count = 1; pNode->count = 1;
pNode->prev = 0; pNode->prev = 0;
pNode->next = pSet->nodeList[hash]; pNode->next = pSet->nodeList[hash];
if (pSet->nodeList[hash]) pSet->nodeList[hash]->prev = pNode;
pSet->nodeList[hash] = pNode; pSet->nodeList[hash] = pNode;
uTrace("refId:%d p:%p is added, count::%d", refId, p, pSet->count); uTrace("refId:%d p:%p is added, count:%d malloc mem: %p", refId, p, pSet->count, pNode);
} else { } else {
code = TSDB_CODE_REF_NO_MEMORY; code = TSDB_CODE_REF_NO_MEMORY;
uTrace("refId:%d p:%p is not added, since no memory", refId, p); uTrace("refId:%d p:%p is not added, since no memory", refId, p);
@ -197,7 +198,7 @@ int taosAcquireRef(int refId, void *p)
SRefNode *pNode; SRefNode *pNode;
SRefSet *pSet; SRefSet *pSet;
if ( refId < 0 || refId >= TSDB_REF_OBJECTS ) { if (refId < 0 || refId >= TSDB_REF_OBJECTS) {
uTrace("refId:%d p:%p failed to acquire, refId not valid", refId, p); uTrace("refId:%d p:%p failed to acquire, refId not valid", refId, p);
return TSDB_CODE_REF_INVALID_ID; return TSDB_CODE_REF_INVALID_ID;
} }
@ -267,7 +268,7 @@ void taosReleaseRef(int refId, void *p)
pNode = pSet->nodeList[hash]; pNode = pSet->nodeList[hash];
while (pNode) { while (pNode) {
if ( pNode->p == p ) if (pNode->p == p)
break; break;
pNode = pNode->next; pNode = pNode->next;
@ -291,7 +292,7 @@ void taosReleaseRef(int refId, void *p)
free(pNode); free(pNode);
released = 1; released = 1;
uTrace("refId:%d p:%p is removed, count::%d", refId, p, pSet->count); uTrace("refId:%d p:%p is removed, count:%d, free mem: %p", refId, p, pSet->count, pNode);
} else { } else {
uTrace("refId:%d p:%p is released", refId, p); uTrace("refId:%d p:%p is released", refId, p);
} }