Skip to content

TDengine
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
TDengine
TDengine
提交 6f6fd3e1 编写于 作者: dengyihao's avatar dengyihao
浏览文件
操作

fix compile error

上级 328687ed
隐藏空白更改
内联 并排
Showing with 79 addition and 76 deletion
include/os/osMemory.h
浏览文件 @ 6f6fd3e1
...@@ -36,19 +36,19 @@ extern "C" { ...@@ -36,19 +36,19 @@ extern "C" {
// #endif // ifndef ALLOW_FORBID_FUNC // #endif // ifndef ALLOW_FORBID_FUNC
#endif // if !defined(WINDOWS) #endif // if !defined(WINDOWS)
// #define taosMemoryFree malloc // // #define taosMemoryFree malloc
#define taosMemoryMalloc malloc // #define taosMemoryMalloc malloc
#define taosMemoryCalloc calloc // #define taosMemoryCalloc calloc
#define taosMemoryRealloc realloc // #define taosMemoryRealloc realloc
#define taosMemoryFree free // #define taosMemoryFree free
int32_t taosMemoryDbgInit(); int32_t taosMemoryDbgInit();
int32_t taosMemoryDbgInitRestore(); int32_t taosMemoryDbgInitRestore();
// void *taosMemoryMalloc(int64_t size); void *taosMemoryMalloc(int64_t size);
// void *taosMemoryCalloc(int64_t num, int64_t size); void *taosMemoryCalloc(int64_t num, int64_t size);
// void *taosMemoryRealloc(void *ptr, int64_t size); void *taosMemoryRealloc(void *ptr, int64_t size);
char *taosStrdup(const char *ptr); char *taosStrdup(const char *ptr);
// void taosMemoryFree(void *ptr); void taosMemoryFree(void *ptr);
int64_t taosMemorySize(void *ptr); int64_t taosMemorySize(void *ptr);
void taosPrintBackTrace(); void taosPrintBackTrace();
void taosMemoryTrim(int32_t size); void taosMemoryTrim(int32_t size);
......
source/libs/stream/src/streamStateRocksdb.c
浏览文件 @ 6f6fd3e1
...@@ -1040,6 +1040,9 @@ int32_t streamStateGetKVByCur_rocksdb(SStreamStateCur* pCur, SWinKey* pKey, cons ...@@ -1040,6 +1040,9 @@ int32_t streamStateGetKVByCur_rocksdb(SStreamStateCur* pCur, SWinKey* pKey, cons
if (pKtmp->opNum != pCur->number) { if (pKtmp->opNum != pCur->number) {
return -1; return -1;
} }
size_t vlen = 0;
if (pVal != NULL) *pVal = (char*)rocksdb_iter_value(pCur->iter, &vlen);
if (pVLen != NULL) *pVLen = vlen;
*pKey = pKtmp->key; *pKey = pKtmp->key;
return 0; return 0;
} }
......
source/os/src/osMemory.c
浏览文件 @ 6f6fd3e1
...@@ -254,64 +254,64 @@ int32_t taosMemoryDbgInitRestore() { ...@@ -254,64 +254,64 @@ int32_t taosMemoryDbgInitRestore() {
#endif #endif
} }
// void *taosMemoryMalloc(int64_t size) { void *taosMemoryMalloc(int64_t size) {
// #ifdef USE_TD_MEMORY #ifdef USE_TD_MEMORY
// void *tmp = malloc(size + sizeof(TdMemoryInfo)); void *tmp = malloc(size + sizeof(TdMemoryInfo));
// if (tmp == NULL) return NULL; if (tmp == NULL) return NULL;
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
// pTdMemoryInfo->memorySize = size;
// pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
// taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
// return (char *)tmp + sizeof(TdMemoryInfo);
// #else
// return malloc(size);
// #endif
// }
// void *taosMemoryCalloc(int64_t num, int64_t size) { TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
// #ifdef USE_TD_MEMORY pTdMemoryInfo->memorySize = size;
// int32_t memorySize = num * size; pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
// char *tmp = calloc(memorySize + sizeof(TdMemoryInfo), 1); taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
// if (tmp == NULL) return NULL;
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
// pTdMemoryInfo->memorySize = memorySize;
// pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
// taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
// return (char *)tmp + sizeof(TdMemoryInfo);
// #else
// return calloc(num, size);
// #endif
// }
// void *taosMemoryRealloc(void *ptr, int64_t size) { return (char *)tmp + sizeof(TdMemoryInfo);
// #ifdef USE_TD_MEMORY #else
// if (ptr == NULL) return taosMemoryMalloc(size); return malloc(size);
#endif
}
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo)); void *taosMemoryCalloc(int64_t num, int64_t size) {
// ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL); #ifdef USE_TD_MEMORY
// if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) { int32_t memorySize = num * size;
// +return NULL; char *tmp = calloc(memorySize + sizeof(TdMemoryInfo), 1);
// + if (tmp == NULL) return NULL;
// }
// TdMemoryInfo tdMemoryInfo; TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
// memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo)); pTdMemoryInfo->memorySize = memorySize;
pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
// void *tmp = realloc(pTdMemoryInfo, size + sizeof(TdMemoryInfo)); return (char *)tmp + sizeof(TdMemoryInfo);
// if (tmp == NULL) return NULL; #else
return calloc(num, size);
#endif
}
// memcpy(tmp, &tdMemoryInfo, sizeof(TdMemoryInfo)); void *taosMemoryRealloc(void *ptr, int64_t size) {
// ((TdMemoryInfoPtr)tmp)->memorySize = size; #ifdef USE_TD_MEMORY
if (ptr == NULL) return taosMemoryMalloc(size);
// return (char *)tmp + sizeof(TdMemoryInfo); TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
// #else ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
// return realloc(ptr, size); if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
// #endif +return NULL;
// } +
}
TdMemoryInfo tdMemoryInfo;
memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo));
void *tmp = realloc(pTdMemoryInfo, size + sizeof(TdMemoryInfo));
if (tmp == NULL) return NULL;
memcpy(tmp, &tdMemoryInfo, sizeof(TdMemoryInfo));
((TdMemoryInfoPtr)tmp)->memorySize = size;
return (char *)tmp + sizeof(TdMemoryInfo);
#else
return realloc(ptr, size);
#endif
}
char *taosStrdup(const char *ptr) { char *taosStrdup(const char *ptr) {
#ifdef USE_TD_MEMORY #ifdef USE_TD_MEMORY
...@@ -334,21 +334,21 @@ char *taosStrdup(const char *ptr) { ...@@ -334,21 +334,21 @@ char *taosStrdup(const char *ptr) {
#endif #endif
} }
// void taosMemoryFree(void *ptr) { void taosMemoryFree(void *ptr) {
// if (NULL == ptr) return; if (NULL == ptr) return;
// #ifdef USE_TD_MEMORY #ifdef USE_TD_MEMORY
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo)); TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
// if (pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) { if (pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) {
// pTdMemoryInfo->memorySize = 0; pTdMemoryInfo->memorySize = 0;
// // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo)); // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
// free(pTdMemoryInfo); free(pTdMemoryInfo);
// } else { } else {
// free(ptr); free(ptr);
// } }
// #else #else
// return free(ptr); return free(ptr);
// #endif #endif
// } }
int64_t taosMemorySize(void *ptr) { int64_t taosMemorySize(void *ptr) {
if (ptr == NULL) return 0; if (ptr == NULL) return 0;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或