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

fix the issue #467

This commit is contained in:
slguan 2019-09-06 11:17:07 +08:00
parent 89769b8d38
commit 391f2de001
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/util/src/tcache.c
View File

@ -504,6 +504,23 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i
return (pNode != NULL) ? pNode->data : NULL; return (pNode != NULL) ? pNode->data : NULL;
} }
static FORCE_INLINE void taosDecRef(SDataNode* pNode) {
if (pNode == NULL) {
return;
}
if (pNode->refCount > 0) {
__sync_add_and_fetch_32(&pNode->refCount, -1);
pTrace("key:%s is released by app.refcnt:%d", pNode->key, pNode->refCount);
} else {
/*
* safety check.
* app may false releases cached object twice, to decrease the refcount more than acquired
*/
pError("key:%s is released by app more than referenced.refcnt:%d", pNode->key, pNode->refCount);
}
}
/** /**
* remove data in cache, the data will not be removed immediately. * remove data in cache, the data will not be removed immediately.
* if it is referenced by other object, it will be remain in cache * if it is referenced by other object, it will be remain in cache
@ -522,17 +539,6 @@ void taosRemoveDataFromCache(void *handle, void **data, bool remove) {
return; return;
} }
if (pNode->refCount > 0) {
__sync_add_and_fetch_32(&pNode->refCount, -1);
pTrace("key:%s is released by app.refcnt:%d", pNode->key, pNode->refCount);
} else {
/*
* safety check.
* app may false releases cached object twice, to decrease the refcount more than acquired
*/
pError("key:%s is released by app more than referenced.refcnt:%d", pNode->key, pNode->refCount);
}
*data = NULL; *data = NULL;
if (remove) { if (remove) {
@ -541,7 +547,9 @@ void taosRemoveDataFromCache(void *handle, void **data, bool remove) {
#else #else
pthread_mutex_lock(&pObj->mutex); pthread_mutex_lock(&pObj->mutex);
#endif #endif
// pNode may be released immediately by other thread after the reference count of pNode is set to 0,
// So we need to lock it in the first place.
taosDecRef(pNode);
taosCacheMoveNodeToTrash(pObj, pNode); taosCacheMoveNodeToTrash(pObj, pNode);
#if defined LINUX #if defined LINUX
@ -549,6 +557,8 @@ void taosRemoveDataFromCache(void *handle, void **data, bool remove) {
#else #else
pthread_mutex_unlock(&pObj->mutex); pthread_mutex_unlock(&pObj->mutex);
#endif #endif
} else {
taosDecRef(pNode);
} }
} }