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

Merge branch 'master' of https://github.com/taosdata/TDengine

This commit is contained in:
slguan 2019-09-05 14:36:49 +08:00
parent 88780e3096 8914c0ccf5
commit 90ff348542
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/util/src/tmempool.c
View File

@ -64,6 +64,7 @@ mpool_h taosMemPoolInit(int numOfBlock, int blockSize) {
pthread_mutex_init(&(pool_p->mutex), NULL); pthread_mutex_init(&(pool_p->mutex), NULL);
memset(pool_p->pool, 0, (size_t)(blockSize * numOfBlock));
for (i = 0; i < pool_p->numOfBlock; ++i) pool_p->freeList[i] = i; for (i = 0; i < pool_p->numOfBlock; ++i) pool_p->freeList[i] = i;
pool_p->first = 0; pool_p->first = 0;
@ -78,9 +79,7 @@ char *taosMemPoolMalloc(mpool_h handle) {
pthread_mutex_lock(&(pool_p->mutex)); pthread_mutex_lock(&(pool_p->mutex));
if (pool_p->numOfFree <= 0) { if (pool_p->numOfFree > 0) {
pTrace("mempool: out of memory");
} else {
pos = pool_p->pool + pool_p->blockSize * (pool_p->freeList[pool_p->first]); pos = pool_p->pool + pool_p->blockSize * (pool_p->freeList[pool_p->first]);
pool_p->first++; pool_p->first++;
pool_p->first = pool_p->first % pool_p->numOfBlock; pool_p->first = pool_p->first % pool_p->numOfBlock;
@ -88,7 +87,8 @@ char *taosMemPoolMalloc(mpool_h handle) {
} }
pthread_mutex_unlock(&(pool_p->mutex)); pthread_mutex_unlock(&(pool_p->mutex));
if (pos != NULL) memset(pos, 0, (size_t)pool_p->blockSize);
if (pos == NULL) pTrace("mempool: out of memory");
return pos; return pos;
} }
@ -98,23 +98,24 @@ void taosMemPoolFree(mpool_h handle, char *pMem) {
if (pMem == NULL) return; if (pMem == NULL) return;
pthread_mutex_lock(&pool_p->mutex);
index = (int)(pMem - pool_p->pool) % pool_p->blockSize; index = (int)(pMem - pool_p->pool) % pool_p->blockSize;
if (index != 0) { if (index != 0) {
pError("invalid free address:%p\n", pMem); pError("invalid free address:%p\n", pMem);
} else { return;
index = (int)((pMem - pool_p->pool) / pool_p->blockSize); }
index = (int)((pMem - pool_p->pool) / pool_p->blockSize);
if (index < 0 || index >= pool_p->numOfBlock) { if (index < 0 || index >= pool_p->numOfBlock) {
pError("mempool: error, invalid address:%p\n", pMem); pError("mempool: error, invalid address:%p\n", pMem);
} else { return;
}
memset(pMem, 0, (size_t)pool_p->blockSize);
pthread_mutex_lock(&pool_p->mutex);
pool_p->freeList[(pool_p->first + pool_p->numOfFree) % pool_p->numOfBlock] = index; pool_p->freeList[(pool_p->first + pool_p->numOfFree) % pool_p->numOfBlock] = index;
pool_p->numOfFree++; pool_p->numOfFree++;
memset(pMem, 0, (size_t)pool_p->blockSize);
}
}
pthread_mutex_unlock(&pool_p->mutex); pthread_mutex_unlock(&pool_p->mutex);
} }
@ -125,6 +126,6 @@ void taosMemPoolCleanUp(mpool_h handle) {
pthread_mutex_destroy(&pool_p->mutex); pthread_mutex_destroy(&pool_p->mutex);
if (pool_p->pool) free(pool_p->pool); if (pool_p->pool) free(pool_p->pool);
if (pool_p->freeList) free(pool_p->freeList); if (pool_p->freeList) free(pool_p->freeList);
memset(&pool_p, 0, sizeof(pool_p)); memset(pool_p, 0, sizeof(*pool_p));
free(pool_p); free(pool_p);
} }