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

Merge pull request #29134 from taosdata/enh/TD-32676-3.0 

chore: test CI
This commit is contained in:
Shengliang Guan 2024-12-13 16:43:46 +08:00 committed by GitHub
parent 3f6ddbcf48 c560671e73
commit d1bfc48439
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 302 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/libs/qworker/src/qwMem.c
View File

@ -79,7 +79,7 @@ void qwDestroySession(QW_FPARAMS_DEF, SQWJobInfo *pJobInfo, void* session) {
char id[sizeof(tId) + sizeof(eId) + 1] = {0}; char id[sizeof(tId) + sizeof(eId) + 1] = {0};
QW_SET_TEID(id, tId, eId); QW_SET_TEID(id, tId, eId);
(void)taosHashRemove(pJobInfo->pSessions, id, sizeof(id)); TAOS_UNUSED(taosHashRemove(pJobInfo->pSessions, id, sizeof(id)));
taosMemPoolDestroySession(gMemPoolHandle, session); taosMemPoolDestroySession(gMemPoolHandle, session);
@ -95,7 +95,7 @@ void qwDestroySession(QW_FPARAMS_DEF, SQWJobInfo *pJobInfo, void* session) {
char id2[sizeof(qId) + sizeof(cId) + 1] = {0}; char id2[sizeof(qId) + sizeof(cId) + 1] = {0};
QW_SET_QCID(id2, qId, cId); QW_SET_QCID(id2, qId, cId);
(void)taosHashRemove(gQueryMgmt.pJobInfo, id2, sizeof(id2)); TAOS_UNUSED(taosHashRemove(gQueryMgmt.pJobInfo, id2, sizeof(id2)));
QW_TASK_DLOG_E("the whole query job removed"); QW_TASK_DLOG_E("the whole query job removed");
} else { } else {
@ -152,7 +152,7 @@ int32_t qwRetrieveJobInfo(QW_FPARAMS_DEF, SQWJobInfo** ppJob) {
continue; continue;
} }
atomic_add_fetch_32(&pJob->memInfo->remainSession, 1); (void)atomic_add_fetch_32(&pJob->memInfo->remainSession, 1);
QW_UNLOCK(QW_READ, &pJob->lock); QW_UNLOCK(QW_READ, &pJob->lock);
break; break;

54
source/util/inc/tmempoolInt.h
View File

@ -21,9 +21,9 @@ extern "C" {
#endif #endif
#include "os.h" #include "os.h"
#include "tlockfree.h"
#include "thash.h"
#include "tglobal.h" #include "tglobal.h"
#include "thash.h"
#include "tlockfree.h"
#define MP_CHUNK_CACHE_ALLOC_BATCH_SIZE 1000 #define MP_CHUNK_CACHE_ALLOC_BATCH_SIZE 1000
#define MP_NSCHUNK_CACHE_ALLOC_BATCH_SIZE 500 #define MP_NSCHUNK_CACHE_ALLOC_BATCH_SIZE 500
@ -36,7 +36,6 @@ extern "C" {
#define MP_MIN_MEM_CHK_INTERVAL_MS 1 #define MP_MIN_MEM_CHK_INTERVAL_MS 1
#define MP_MEMORY_TRIM_INTERVAL_TIMES 500 #define MP_MEMORY_TRIM_INTERVAL_TIMES 500
#define MP_RETIRE_HIGH_THRESHOLD_PERCENT (0.95) #define MP_RETIRE_HIGH_THRESHOLD_PERCENT (0.95)
#define MP_RETIRE_MID_THRESHOLD_PERCENT (0.9) #define MP_RETIRE_MID_THRESHOLD_PERCENT (0.9)
#define MP_RETIRE_LOW_THRESHOLD_PERCENT (0.85) #define MP_RETIRE_LOW_THRESHOLD_PERCENT (0.85)
@ -48,12 +47,10 @@ extern "C" {
#define MP_MIN_FREE_SIZE_AFTER_RESERVE (4 * 1024 * 1048576L) #define MP_MIN_FREE_SIZE_AFTER_RESERVE (4 * 1024 * 1048576L)
#define MP_MIN_MEM_POOL_SIZE (5 * 1024 * 1048576L) #define MP_MIN_MEM_POOL_SIZE (5 * 1024 * 1048576L)
// FLAGS AREA // FLAGS AREA
#define MP_CHUNK_FLAG_IN_USE (1 << 0) #define MP_CHUNK_FLAG_IN_USE (1 << 0)
#define MP_CHUNK_FLAG_NS_CHUNK (1 << 1) #define MP_CHUNK_FLAG_NS_CHUNK (1 << 1)
// STAT FLAGS // STAT FLAGS
#define MP_LOG_FLAG_ALL_MEM (1 << 0) #define MP_LOG_FLAG_ALL_MEM (1 << 0)
#define MP_LOG_FLAG_ALL_CHUNK (1 << 1) #define MP_LOG_FLAG_ALL_CHUNK (1 << 1)
@ -69,7 +66,6 @@ extern "C" {
#define MP_STAT_FLAG_LOG_ALL (0xFFFFFFFFFFFFFFFF) #define MP_STAT_FLAG_LOG_ALL (0xFFFFFFFFFFFFFFFF)
// STAT PROCESURE FLAGS // STAT PROCESURE FLAGS
#define MP_STAT_PROC_FLAG_EXEC (1 << 0) #define MP_STAT_PROC_FLAG_EXEC (1 << 0)
#define MP_STAT_PROC_FLAG_INPUT_ERR (1 << 1) #define MP_STAT_PROC_FLAG_INPUT_ERR (1 << 1)
@ -82,7 +78,6 @@ extern "C" {
#define MP_CTRL_FLAG_LOCK_DBG (1 << 2) #define MP_CTRL_FLAG_LOCK_DBG (1 << 2)
#define MP_CTRL_FLAG_LOG_MAXSIZE (1 << 3) #define MP_CTRL_FLAG_LOG_MAXSIZE (1 << 3)
typedef enum EMPStatLogItem { typedef enum EMPStatLogItem {
E_MP_STAT_LOG_MEM_MALLOC = 1, E_MP_STAT_LOG_MEM_MALLOC = 1,
E_MP_STAT_LOG_MEM_CALLOC, E_MP_STAT_LOG_MEM_CALLOC,
@ -133,7 +128,6 @@ typedef struct SMPNSChunk {
uint64_t memBytes; uint64_t memBytes;
} SMPNSChunk; } SMPNSChunk;
typedef struct SMPCacheGroup { typedef struct SMPCacheGroup {
int32_t nodesNum; int32_t nodesNum;
int32_t idleOffset; int32_t idleOffset;
@ -151,7 +145,6 @@ typedef struct SMPStatInput {
void* pOrigMem; void* pOrigMem;
} SMPStatInput; } SMPStatInput;
typedef struct SMPCtrlInfo { typedef struct SMPCtrlInfo {
int64_t statFlags; int64_t statFlags;
int64_t funcFlags; int64_t funcFlags;
@ -200,7 +193,6 @@ typedef struct SMPStatInfo {
SMPStatPos posStat; SMPStatPos posStat;
} SMPStatInfo; } SMPStatInfo;
typedef struct SMPJob { typedef struct SMPJob {
SMemPoolJob job; // KEEP IT FIRST SMemPoolJob job; // KEEP IT FIRST
SMPStatInfo stat; SMPStatInfo stat;
@ -276,7 +268,6 @@ typedef struct SMPChunkMgmt {
SMPChunk* readyNSChunkTail; SMPChunk* readyNSChunkTail;
} SMPChunkMgmt; } SMPChunkMgmt;
typedef struct SMemPool { typedef struct SMemPool {
char* name; char* name;
int16_t slotId; int16_t slotId;
@ -322,7 +313,6 @@ typedef struct SMemPoolMgmt {
extern SMemPoolMgmt gMPMgmt; extern SMemPoolMgmt gMPMgmt;
typedef int32_t (*mpAllocFunc)(SMemPool*, SMPSession*, int64_t*, uint32_t, void**); typedef int32_t (*mpAllocFunc)(SMemPool*, SMPSession*, int64_t*, uint32_t, void**);
typedef void (*mpFreeFunc)(SMemPool*, SMPSession*, void*, int64_t*); typedef void (*mpFreeFunc)(SMemPool*, SMPSession*, void*, int64_t*);
typedef int64_t (*mpGetSizeFunc)(SMemPool*, SMPSession*, void*); typedef int64_t (*mpGetSizeFunc)(SMemPool*, SMPSession*, void*);
@ -353,10 +343,13 @@ enum {
}; };
#define MP_STAT_FORMAT "%-8s => inErr:%10" PRId64 ", exec:%12" PRId64 ", succ:%12" PRId64 ", fail:%12" PRId64 #define MP_STAT_FORMAT "%-8s => inErr:%10" PRId64 ", exec:%12" PRId64 ", succ:%12" PRId64 ", fail:%12" PRId64
#define MP_STAT_ORIG_FORMAT "%-8s => inErr:%10" PRId64 ", exec:%12" PRId64 ", succ:%12" PRId64 ", fail:%12" PRId64 ", oExec:%12" PRId64 ", oSucc:%12" PRId64 ", oFail:%12" PRId64 #define MP_STAT_ORIG_FORMAT \
"%-8s => inErr:%10" PRId64 ", exec:%12" PRId64 ", succ:%12" PRId64 ", fail:%12" PRId64 ", oExec:%12" PRId64 \
", oSucc:%12" PRId64 ", oFail:%12" PRId64
#define MP_STAT_VALUE(_name, _item) _name, (_item).inErr, (_item).exec, (_item).succ, (_item).fail #define MP_STAT_VALUE(_name, _item) _name, (_item).inErr, (_item).exec, (_item).succ, (_item).fail
#define MP_STAT_ORIG_VALUE(_name, _item) _name, (_item).inErr, (_item).exec, (_item).succ, (_item).fail, (_item).origExec, (_item).origSucc, (_item).origFail #define MP_STAT_ORIG_VALUE(_name, _item) \
_name, (_item).inErr, (_item).exec, (_item).succ, (_item).fail, (_item).origExec, (_item).origSucc, (_item).origFail
#define MP_INIT_MEM_HEADER(_header, _size, _nsChunk) \ #define MP_INIT_MEM_HEADER(_header, _size, _nsChunk) \
do { \ do { \
@ -384,49 +377,42 @@ enum {
do { \ do { \
if (MP_READ == (type)) { \ if (MP_READ == (type)) { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value before try read lock"); \
uDebug("MP TRY RLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP TRY RLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
(_res) = taosRTryLockLatch(_lock); \ (_res) = taosRTryLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP TRY RLOCK%p:%d %s, %s:%d E", (_lock), atomic_load_32(_lock), (_res) ? "failed" : "succeed", __FILE__, __LINE__); \ uDebug("MP TRY RLOCK%p:%d %s, %s:%d E", (_lock), atomic_load_32(_lock), (_res) ? "failed" : "succeed", \
ASSERTS((_res) ? atomic_load_32((_lock)) >= 0 : atomic_load_32((_lock)) > 0, "invalid lock value after try read lock"); \ __FILE__, __LINE__); \
} \ } \
} else { \ } else { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value before try write lock"); \
uDebug("MP TRY WLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP TRY WLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
(_res) = taosWTryLockLatch(_lock); \ (_res) = taosWTryLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP TRY WLOCK%p:%d %s, %s:%d E", (_lock), atomic_load_32(_lock), (_res) ? "failed" : "succeed", __FILE__, __LINE__); \ uDebug("MP TRY WLOCK%p:%d %s, %s:%d E", (_lock), atomic_load_32(_lock), (_res) ? "failed" : "succeed", \
ASSERTS((_res) ? atomic_load_32((_lock)) >= 0 : atomic_load_32((_lock)) == TD_RWLATCH_WRITE_FLAG_COPY, "invalid lock value after try write lock"); \ __FILE__, __LINE__); \
} \ } \
} \ } \
} while (0) } while (0)
#define MP_LOCK(type, _lock) \ #define MP_LOCK(type, _lock) \
do { \ do { \
if (MP_READ == (type)) { \ if (MP_READ == (type)) { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value before read lock"); \
uDebug("MP RLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP RLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
taosRLockLatch(_lock); \ taosRLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP RLOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP RLOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
ASSERTS(atomic_load_32((_lock)) > 0, "invalid lock value after read lock"); \
} \ } \
} else { \ } else { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value before write lock"); \
uDebug("MP WLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP WLOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
taosWLockLatch(_lock); \ taosWLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP WLOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP WLOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
ASSERTS(atomic_load_32((_lock)) == TD_RWLATCH_WRITE_FLAG_COPY, "invalid lock value after write lock"); \
} \ } \
} \ } \
} while (0) } while (0)
@ -435,28 +421,23 @@ enum {
do { \ do { \
if (MP_READ == (type)) { \ if (MP_READ == (type)) { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) > 0, "invalid lock value before read unlock"); \
uDebug("MP RULOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP RULOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
taosRUnLockLatch(_lock); \ taosRUnLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP RULOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP RULOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value after read unlock"); \
} \ } \
} else { \ } else { \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
ASSERTS(atomic_load_32((_lock)) == TD_RWLATCH_WRITE_FLAG_COPY, "invalid lock value before write unlock"); \
uDebug("MP WULOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP WULOCK%p:%d, %s:%d B", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
} \ } \
taosWUnLockLatch(_lock); \ taosWUnLockLatch(_lock); \
if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \ if (MP_GET_FLAG(gMPMgmt.ctrl.funcFlags, MP_CTRL_FLAG_LOCK_DBG)) { \
uDebug("MP WULOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \ uDebug("MP WULOCK%p:%d, %s:%d E", (_lock), atomic_load_32(_lock), __FILE__, __LINE__); \
ASSERTS(atomic_load_32((_lock)) >= 0, "invalid lock value after write unlock"); \
} \ } \
} \ } \
} while (0) } while (0)
#define MP_ERR_RET(c) \ #define MP_ERR_RET(c) \
do { \ do { \
int32_t _code = c; \ int32_t _code = c; \
@ -484,17 +465,20 @@ enum {
} \ } \
} while (0) } while (0)
#define MP_CHECK_QUOTA(_pool, _job, _size) do { \ #define MP_CHECK_QUOTA(_pool, _job, _size) \
do { \
if (*(_pool)->cfg.jobQuota > 0) { \ if (*(_pool)->cfg.jobQuota > 0) { \
int64_t cAllocSize = atomic_add_fetch_64(&(_job)->job.allocMemSize, (_size)); \ int64_t cAllocSize = atomic_add_fetch_64(&(_job)->job.allocMemSize, (_size)); \
if (cAllocSize > (*(_pool)->cfg.jobQuota * 1048576L)) { \ if (cAllocSize > (*(_pool)->cfg.jobQuota * 1048576L)) { \
uWarn("job 0x%" PRIx64 " remainSession:%d allocSize %" PRId64 " is over than quota %dMB", (_job)->job.jobId, (_job)->job.remainSession, cAllocSize, *(_pool)->cfg.jobQuota); \ uWarn("job 0x%" PRIx64 " remainSession:%d allocSize %" PRId64 " is over than quota %dMB", (_job)->job.jobId, \
(_job)->job.remainSession, cAllocSize, *(_pool)->cfg.jobQuota); \
(_pool)->cfg.cb.reachFp(pJob->job.jobId, (_job)->job.clientId, TSDB_CODE_QRY_REACH_QMEM_THRESHOLD); \ (_pool)->cfg.cb.reachFp(pJob->job.jobId, (_job)->job.clientId, TSDB_CODE_QRY_REACH_QMEM_THRESHOLD); \
mpSchedTrim(NULL); \ mpSchedTrim(NULL); \
terrno = TSDB_CODE_QRY_REACH_QMEM_THRESHOLD; \ terrno = TSDB_CODE_QRY_REACH_QMEM_THRESHOLD; \
return NULL; \ return NULL; \
} else { \ } else { \
uDebug("job 0x%" PRIx64 " remainSession:%d allocSize %" PRId64 " is lower than quota %dMB", (_job)->job.jobId, (_job)->job.remainSession, cAllocSize, *(_pool)->cfg.jobQuota); \ uDebug("job 0x%" PRIx64 " remainSession:%d allocSize %" PRId64 " is lower than quota %dMB", (_job)->job.jobId, \
(_job)->job.remainSession, cAllocSize, *(_pool)->cfg.jobQuota); \
} \ } \
} \ } \
if (atomic_load_64(&tsCurrentAvailMemorySize) <= ((_pool)->cfg.reserveSize + (_size))) { \ if (atomic_load_64(&tsCurrentAvailMemorySize) <= ((_pool)->cfg.reserveSize + (_size))) { \
@ -507,7 +491,6 @@ enum {
} \ } \
} while (0) } while (0)
// direct // direct
void* mpDirectAlloc(SMemPool* pPool, SMPJob* pJob, int64_t size); void* mpDirectAlloc(SMemPool* pPool, SMPJob* pJob, int64_t size);
void* mpDirectAlignAlloc(SMemPool* pPool, SMPJob* pJob, uint32_t alignment, int64_t size); void* mpDirectAlignAlloc(SMemPool* pPool, SMPJob* pJob, uint32_t alignment, int64_t size);
@ -532,7 +515,6 @@ int32_t mpChunkRealloc(SMemPool* pPool, SMPSession* pSession, void **pPtr, int64
int32_t mpChunkInitSession(SMemPool* pPool, SMPSession* pSession); int32_t mpChunkInitSession(SMemPool* pPool, SMPSession* pSession);
int32_t mpChunkUpdateCfg(SMemPool* pPool); int32_t mpChunkUpdateCfg(SMemPool* pPool);
int32_t mpPopIdleNode(SMemPool* pPool, SMPCacheGroupInfo* pInfo, void** ppRes); int32_t mpPopIdleNode(SMemPool* pPool, SMPCacheGroupInfo* pInfo, void** ppRes);
int32_t mpChkFullQuota(SMemPool* pPool, SMPSession* pSession, int64_t size); int32_t mpChkFullQuota(SMemPool* pPool, SMPSession* pSession, int64_t size);
void mpUpdateAllocSize(SMemPool* pPool, SMPSession* pSession, int64_t size, int64_t addSize); void mpUpdateAllocSize(SMemPool* pPool, SMPSession* pSession, int64_t size, int64_t addSize);
@ -540,8 +522,6 @@ int32_t mpAddCacheGroup(SMemPool* pPool, SMPCacheGroupInfo* pInfo, SMPCacheGroup
int32_t mpMalloc(SMemPool* pPool, SMPSession* pSession, int64_t* size, uint32_t alignment, void** ppRes); int32_t mpMalloc(SMemPool* pPool, SMPSession* pSession, int64_t* size, uint32_t alignment, void** ppRes);
void mpSchedTrim(int64_t* loopTimes); void mpSchedTrim(int64_t* loopTimes);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

118
source/util/src/tmempool.c
View File

@ -95,7 +95,7 @@ int32_t mpAddCacheGroup(SMemPool* pPool, SMPCacheGroupInfo* pInfo, SMPCacheGroup
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
atomic_add_fetch_64(&pInfo->allocNum, pGrp->nodesNum); (void)atomic_add_fetch_64(&pInfo->allocNum, pGrp->nodesNum);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -138,7 +138,7 @@ int32_t mpPopIdleNode(SMemPool* pPool, SMPCacheGroupInfo* pInfo, void** ppRes) {
pNode = (SMPListNode*)((char*)pGrp->pNodes + offset * pInfo->nodeSize); pNode = (SMPListNode*)((char*)pGrp->pNodes + offset * pInfo->nodeSize);
break; break;
} else { } else {
atomic_sub_fetch_32(&pGrp->idleOffset, 1); (void)atomic_sub_fetch_32(&pGrp->idleOffset, 1);
} }
MP_ERR_RET(mpAddCacheGroup(pPool, pInfo, pGrp)); MP_ERR_RET(mpAddCacheGroup(pPool, pInfo, pGrp));
@ -271,9 +271,9 @@ FORCE_INLINE void mpUpdateMaxAllocSize(int64_t* pMaxAllocMemSize, int64_t newSiz
void mpUpdateAllocSize(SMemPool* pPool, SMPSession* pSession, int64_t size, int64_t addSize) { void mpUpdateAllocSize(SMemPool* pPool, SMPSession* pSession, int64_t size, int64_t addSize) {
if (addSize) { if (addSize) {
if (NULL != pSession) { if (NULL != pSession) {
atomic_add_fetch_64(&pSession->pJob->job.allocMemSize, addSize); (void)atomic_add_fetch_64(&pSession->pJob->job.allocMemSize, addSize);
} }
atomic_add_fetch_64(&pPool->allocMemSize, addSize); (void)atomic_add_fetch_64(&pPool->allocMemSize, addSize);
} }
if (NULL != pSession) { if (NULL != pSession) {
@ -495,8 +495,8 @@ int32_t mpAddToRemainAllocHash(SHashObj* pHash, SMPFileLine* pFileLine) {
continue; continue;
} }
atomic_add_fetch_64(&pStat->allocBytes, pFileLine->size); (void)atomic_add_fetch_64(&pStat->allocBytes, pFileLine->size);
atomic_add_fetch_64(&pStat->allocTimes, 1); (void)atomic_add_fetch_64(&pStat->allocTimes, 1);
break; break;
} }
@ -593,107 +593,107 @@ void mpLogDetailStat(SMPStatDetail* pDetail, EMPStatLogItem item, SMPStatInput*
switch (item) { switch (item) {
case E_MP_STAT_LOG_MEM_MALLOC: { case E_MP_STAT_LOG_MEM_MALLOC: {
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memMalloc.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memMalloc.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memMalloc.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memMalloc.exec, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memMalloc.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memMalloc.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memMalloc.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memMalloc.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memMalloc.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memMalloc.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memMalloc.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memMalloc.fail, pInput->size);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_CALLOC:{ case E_MP_STAT_LOG_MEM_CALLOC:{
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memCalloc.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memCalloc.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memCalloc.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memCalloc.exec, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memCalloc.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memCalloc.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memCalloc.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memCalloc.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memCalloc.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memCalloc.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memCalloc.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memCalloc.fail, pInput->size);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_REALLOC:{ case E_MP_STAT_LOG_MEM_REALLOC:{
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memRealloc.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memRealloc.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.exec, pInput->size);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.origExec, pInput->origSize); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.origExec, pInput->origSize);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memRealloc.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memRealloc.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.succ, pInput->size);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.origSucc, pInput->origSize); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.origSucc, pInput->origSize);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memRealloc.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memRealloc.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.fail, pInput->size);
atomic_add_fetch_64(&pDetail->bytes.memRealloc.origFail, pInput->origSize); (void)atomic_add_fetch_64(&pDetail->bytes.memRealloc.origFail, pInput->origSize);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_FREE:{ case E_MP_STAT_LOG_MEM_FREE:{
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memFree.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memFree.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memFree.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memFree.exec, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memFree.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memFree.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memFree.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memFree.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memFree.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memFree.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memFree.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memFree.fail, pInput->size);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_STRDUP: { case E_MP_STAT_LOG_MEM_STRDUP: {
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memStrdup.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrdup.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrdup.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrdup.exec, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memStrdup.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrdup.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrdup.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrdup.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memStrdup.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrdup.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrdup.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrdup.fail, pInput->size);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_STRNDUP: { case E_MP_STAT_LOG_MEM_STRNDUP: {
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memStrndup.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrndup.exec, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrndup.exec, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrndup.exec, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memStrndup.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrndup.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrndup.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrndup.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memStrndup.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memStrndup.fail, 1);
atomic_add_fetch_64(&pDetail->bytes.memStrndup.fail, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memStrndup.fail, pInput->size);
} }
break; break;
} }
case E_MP_STAT_LOG_MEM_TRIM: { case E_MP_STAT_LOG_MEM_TRIM: {
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_EXEC)) {
atomic_add_fetch_64(&pDetail->times.memTrim.exec, 1); (void)atomic_add_fetch_64(&pDetail->times.memTrim.exec, 1);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_SUCC)) {
atomic_add_fetch_64(&pDetail->times.memTrim.succ, 1); (void)atomic_add_fetch_64(&pDetail->times.memTrim.succ, 1);
atomic_add_fetch_64(&pDetail->bytes.memTrim.succ, pInput->size); (void)atomic_add_fetch_64(&pDetail->bytes.memTrim.succ, pInput->size);
} }
if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) { if (MP_GET_FLAG(pInput->procFlags, MP_STAT_PROC_FLAG_RES_FAIL)) {
atomic_add_fetch_64(&pDetail->times.memTrim.fail, 1); (void)atomic_add_fetch_64(&pDetail->times.memTrim.fail, 1);
} }
break; break;
} }
@ -793,8 +793,8 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
MP_ERR_JRET(code); MP_ERR_JRET(code);
} }
atomic_add_fetch_64(&pAlloc->allocTimes, 1); (void)atomic_add_fetch_64(&pAlloc->allocTimes, 1);
atomic_add_fetch_64(&pAlloc->allocBytes, pInput->size); (void)atomic_add_fetch_64(&pAlloc->allocBytes, pInput->size);
break; break;
} }
case E_MP_STAT_LOG_MEM_REALLOC: { case E_MP_STAT_LOG_MEM_REALLOC: {
@ -808,7 +808,7 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
MP_ERR_JRET(code); MP_ERR_JRET(code);
} }
ASSERT((pInput->pOrigMem && pInput->origSize > 0) || (NULL == pInput->pOrigMem && pInput->origSize == 0)); // ASSSRT((pInput->pOrigMem && pInput->origSize > 0) || (NULL == pInput->pOrigMem && pInput->origSize == 0));
if (pInput->pOrigMem && pInput->origSize > 0) { if (pInput->pOrigMem && pInput->origSize > 0) {
code = taosHashRemove(pStat->remainHash, &pInput->pOrigMem, POINTER_BYTES); code = taosHashRemove(pStat->remainHash, &pInput->pOrigMem, POINTER_BYTES);
@ -824,8 +824,8 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
MP_ERR_JRET(code); MP_ERR_JRET(code);
} }
atomic_add_fetch_64(&pFree->freeTimes, 1); (void)atomic_add_fetch_64(&pFree->freeTimes, 1);
atomic_add_fetch_64(&pFree->freeBytes, pInput->origSize); (void)atomic_add_fetch_64(&pFree->freeBytes, pInput->origSize);
} }
code = taosHashPut(pStat->remainHash, &pInput->pMem, POINTER_BYTES, &fileLine, sizeof(fileLine)); code = taosHashPut(pStat->remainHash, &pInput->pMem, POINTER_BYTES, &fileLine, sizeof(fileLine));
@ -856,8 +856,8 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
MP_ERR_JRET(code); MP_ERR_JRET(code);
} }
atomic_add_fetch_64(&pAlloc->allocTimes, 1); (void)atomic_add_fetch_64(&pAlloc->allocTimes, 1);
atomic_add_fetch_64(&pAlloc->allocBytes, pInput->size); (void)atomic_add_fetch_64(&pAlloc->allocBytes, pInput->size);
break; break;
} }
case E_MP_STAT_LOG_MEM_FREE: { case E_MP_STAT_LOG_MEM_FREE: {
@ -884,8 +884,8 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
MP_ERR_JRET(code); MP_ERR_JRET(code);
} }
atomic_add_fetch_64(&pFree->freeTimes, 1); (void)atomic_add_fetch_64(&pFree->freeTimes, 1);
atomic_add_fetch_64(&pFree->freeBytes, pInput->size); (void)atomic_add_fetch_64(&pFree->freeBytes, pInput->size);
break; break;
} }
case E_MP_STAT_LOG_MEM_TRIM: case E_MP_STAT_LOG_MEM_TRIM:
@ -905,7 +905,7 @@ void mpLogPosStat(SMPStatPos* pStat, EMPStatLogItem item, SMPStatInput* pInput,
_return: _return:
atomic_add_fetch_64(&pStat->logErrTimes, 1); (void)atomic_add_fetch_64(&pStat->logErrTimes, 1);
} }