Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
86fe2169
T
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1181
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
86fe2169
编写于
3月 28, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add backend
上级
ca5f813c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
126 addition
and
112 deletion
+126
-112
include/os/osMemory.h
include/os/osMemory.h
+19
-13
source/libs/catalog/src/ctgRemote.c
source/libs/catalog/src/ctgRemote.c
+29
-27
source/libs/stream/CMakeLists.txt
source/libs/stream/CMakeLists.txt
+5
-1
source/os/src/osMemory.c
source/os/src/osMemory.c
+73
-71
未找到文件。
include/os/osMemory.h
浏览文件 @
86fe2169
...
@@ -24,25 +24,31 @@ extern "C" {
...
@@ -24,25 +24,31 @@ extern "C" {
// When you want to use this feature, you should find or add the same function in the following sectio
// When you want to use this feature, you should find or add the same function in the following sectio
#if !defined(WINDOWS)
#if !defined(WINDOWS)
#ifndef ALLOW_FORBID_FUNC
//
#ifndef ALLOW_FORBID_FUNC
#define malloc MALLOC_FUNC_TAOS_FORBID
//
#define malloc MALLOC_FUNC_TAOS_FORBID
#define calloc CALLOC_FUNC_TAOS_FORBID
//
#define calloc CALLOC_FUNC_TAOS_FORBID
#define realloc REALLOC_FUNC_TAOS_FORBID
//
#define realloc REALLOC_FUNC_TAOS_FORBID
#define free FREE_FUNC_TAOS_FORBID
//
#define free FREE_FUNC_TAOS_FORBID
#ifdef strdup
#ifdef strdup
#undef strdup
#undef strdup
#define strdup
STRDUP_FUNC_TAOS_FORBID
#define strdup STRDUP_FUNC_TAOS_FORBID
#endif
#endif
#endif // ifndef ALLOW_FORBID_FUNC
// #endif // ifndef ALLOW_FORBID_FUNC
#endif // if !defined(WINDOWS)
#endif // if !defined(WINDOWS)
// #define taosMemoryFree malloc
#define taosMemoryMalloc malloc
#define taosMemoryCalloc calloc
#define taosMemoryRealloc realloc
#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/catalog/src/ctgRemote.c
浏览文件 @
86fe2169
...
@@ -13,23 +13,25 @@
...
@@ -13,23 +13,25 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/
#include "ctgRemote.h"
#include "catalogInt.h"
#include "catalogInt.h"
#include "query.h"
#include "query.h"
#include "systable.h"
#include "systable.h"
#include "tname.h"
#include "tname.h"
#include "tref.h"
#include "tref.h"
#include "trpc.h"
#include "trpc.h"
#include "ctgRemote.h"
typedef
void
*
(
*
MallocType
)(
int64_t
);
int32_t
ctgHandleBatchRsp
(
SCtgJob
*
pJob
,
SCtgTaskCallbackParam
*
cbParam
,
SDataBuf
*
pMsg
,
int32_t
rspCode
)
{
int32_t
ctgHandleBatchRsp
(
SCtgJob
*
pJob
,
SCtgTaskCallbackParam
*
cbParam
,
SDataBuf
*
pMsg
,
int32_t
rspCode
)
{
int32_t
code
=
0
;
int32_t
code
=
0
;
SCatalog
*
pCtg
=
pJob
->
pCtg
;
SCatalog
*
pCtg
=
pJob
->
pCtg
;
int32_t
taskNum
=
taosArrayGetSize
(
cbParam
->
taskId
);
int32_t
taskNum
=
taosArrayGetSize
(
cbParam
->
taskId
);
SDataBuf
taskMsg
=
*
pMsg
;
SDataBuf
taskMsg
=
*
pMsg
;
int32_t
msgNum
=
0
;
int32_t
msgNum
=
0
;
SBatchRsp
batchRsp
=
{
0
};
SBatchRsp
batchRsp
=
{
0
};
SBatchRspMsg
rsp
=
{
0
};
SBatchRspMsg
rsp
=
{
0
};
SBatchRspMsg
*
pRsp
=
NULL
;
SBatchRspMsg
*
pRsp
=
NULL
;
if
(
TSDB_CODE_SUCCESS
==
rspCode
&&
pMsg
->
pData
&&
(
pMsg
->
len
>
0
))
{
if
(
TSDB_CODE_SUCCESS
==
rspCode
&&
pMsg
->
pData
&&
(
pMsg
->
len
>
0
))
{
if
(
tDeserializeSBatchRsp
(
pMsg
->
pData
,
pMsg
->
len
,
&
batchRsp
)
<
0
)
{
if
(
tDeserializeSBatchRsp
(
pMsg
->
pData
,
pMsg
->
len
,
&
batchRsp
)
<
0
)
{
...
@@ -39,7 +41,7 @@ int32_t ctgHandleBatchRsp(SCtgJob* pJob, SCtgTaskCallbackParam* cbParam, SDataBu
...
@@ -39,7 +41,7 @@ int32_t ctgHandleBatchRsp(SCtgJob* pJob, SCtgTaskCallbackParam* cbParam, SDataBu
msgNum
=
taosArrayGetSize
(
batchRsp
.
pRsps
);
msgNum
=
taosArrayGetSize
(
batchRsp
.
pRsps
);
}
}
if
(
ASSERTS
(
taskNum
==
msgNum
||
0
==
msgNum
,
"taskNum %d mis-match msgNum %d"
,
taskNum
,
msgNum
))
{
if
(
ASSERTS
(
taskNum
==
msgNum
||
0
==
msgNum
,
"taskNum %d mis-match msgNum %d"
,
taskNum
,
msgNum
))
{
msgNum
=
0
;
msgNum
=
0
;
}
}
...
@@ -582,8 +584,8 @@ _return:
...
@@ -582,8 +584,8 @@ _return:
return
code
;
return
code
;
}
}
int32_t
ctgBuildBatchReqMsg
(
SCtgBatch
*
pBatch
,
int32_t
vgId
,
void
**
msg
,
int32_t
*
pSize
)
{
int32_t
ctgBuildBatchReqMsg
(
SCtgBatch
*
pBatch
,
int32_t
vgId
,
void
**
msg
,
int32_t
*
pSize
)
{
int32_t
num
=
taosArrayGetSize
(
pBatch
->
pMsgs
);
int32_t
num
=
taosArrayGetSize
(
pBatch
->
pMsgs
);
if
(
num
>=
CTG_MAX_REQ_IN_BATCH
)
{
if
(
num
>=
CTG_MAX_REQ_IN_BATCH
)
{
qError
(
"too many msgs %d in one batch request"
,
num
);
qError
(
"too many msgs %d in one batch request"
,
num
);
CTG_ERR_RET
(
TSDB_CODE_CTG_INVALID_INPUT
);
CTG_ERR_RET
(
TSDB_CODE_CTG_INVALID_INPUT
);
...
@@ -599,7 +601,7 @@ int32_t ctgBuildBatchReqMsg(SCtgBatch* pBatch, int32_t vgId, void** msg, int32_t
...
@@ -599,7 +601,7 @@ int32_t ctgBuildBatchReqMsg(SCtgBatch* pBatch, int32_t vgId, void** msg, int32_t
qError
(
"tSerializeSBatchReq failed"
);
qError
(
"tSerializeSBatchReq failed"
);
CTG_ERR_RET
(
TSDB_CODE_OUT_OF_MEMORY
);
CTG_ERR_RET
(
TSDB_CODE_OUT_OF_MEMORY
);
}
}
*
msg
=
taosMemoryCalloc
(
1
,
msgSize
);
*
msg
=
taosMemoryCalloc
(
1
,
msgSize
);
if
(
NULL
==
(
*
msg
))
{
if
(
NULL
==
(
*
msg
))
{
qError
(
"calloc batchReq msg failed, size:%d"
,
msgSize
);
qError
(
"calloc batchReq msg failed, size:%d"
,
msgSize
);
...
@@ -625,7 +627,7 @@ int32_t ctgLaunchBatchs(SCatalog* pCtg, SCtgJob* pJob, SHashObj* pBatchs) {
...
@@ -625,7 +627,7 @@ int32_t ctgLaunchBatchs(SCatalog* pCtg, SCtgJob* pJob, SHashObj* pBatchs) {
size_t
len
=
0
;
size_t
len
=
0
;
int32_t
*
vgId
=
taosHashGetKey
(
p
,
&
len
);
int32_t
*
vgId
=
taosHashGetKey
(
p
,
&
len
);
SCtgBatch
*
pBatch
=
(
SCtgBatch
*
)
p
;
SCtgBatch
*
pBatch
=
(
SCtgBatch
*
)
p
;
int32_t
msgSize
=
0
;
int32_t
msgSize
=
0
;
ctgDebug
(
"QID:0x%"
PRIx64
" ctg start to launch batch %d"
,
pJob
->
queryId
,
pBatch
->
batchId
);
ctgDebug
(
"QID:0x%"
PRIx64
" ctg start to launch batch %d"
,
pJob
->
queryId
,
pBatch
->
batchId
);
...
@@ -654,7 +656,7 @@ int32_t ctgGetQnodeListFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SArray
...
@@ -654,7 +656,7 @@ int32_t ctgGetQnodeListFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SArray
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_QNODE_LIST
;
int32_t
reqType
=
TDMT_MND_QNODE_LIST
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get qnode list from mnode, mgmtEpInUse:%d"
,
pConn
->
mgmtEps
.
inUse
);
ctgDebug
(
"try to get qnode list from mnode, mgmtEpInUse:%d"
,
pConn
->
mgmtEps
.
inUse
);
...
@@ -708,7 +710,7 @@ int32_t ctgGetDnodeListFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SArray
...
@@ -708,7 +710,7 @@ int32_t ctgGetDnodeListFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SArray
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_DNODE_LIST
;
int32_t
reqType
=
TDMT_MND_DNODE_LIST
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get dnode list from mnode, mgmtEpInUse:%d"
,
pConn
->
mgmtEps
.
inUse
);
ctgDebug
(
"try to get dnode list from mnode, mgmtEpInUse:%d"
,
pConn
->
mgmtEps
.
inUse
);
...
@@ -759,7 +761,7 @@ int32_t ctgGetDBVgInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SBuildU
...
@@ -759,7 +761,7 @@ int32_t ctgGetDBVgInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SBuildU
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_USE_DB
;
int32_t
reqType
=
TDMT_MND_USE_DB
;
SCtgTask
*
pTask
=
tReq
?
tReq
->
pTask
:
NULL
;
SCtgTask
*
pTask
=
tReq
?
tReq
->
pTask
:
NULL
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get db vgInfo from mnode, dbFName:%s"
,
input
->
db
);
ctgDebug
(
"try to get db vgInfo from mnode, dbFName:%s"
,
input
->
db
);
...
@@ -811,7 +813,7 @@ int32_t ctgGetDBCfgFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const char
...
@@ -811,7 +813,7 @@ int32_t ctgGetDBCfgFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const char
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_GET_DB_CFG
;
int32_t
reqType
=
TDMT_MND_GET_DB_CFG
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get db cfg from mnode, dbFName:%s"
,
dbFName
);
ctgDebug
(
"try to get db cfg from mnode, dbFName:%s"
,
dbFName
);
...
@@ -866,7 +868,7 @@ int32_t ctgGetIndexInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const
...
@@ -866,7 +868,7 @@ int32_t ctgGetIndexInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_GET_INDEX
;
int32_t
reqType
=
TDMT_MND_GET_INDEX
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get index from mnode, indexName:%s"
,
indexName
);
ctgDebug
(
"try to get index from mnode, indexName:%s"
,
indexName
);
...
@@ -921,7 +923,7 @@ int32_t ctgGetTbIndexFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SName* n
...
@@ -921,7 +923,7 @@ int32_t ctgGetTbIndexFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, SName* n
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_GET_TABLE_INDEX
;
int32_t
reqType
=
TDMT_MND_GET_TABLE_INDEX
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
tNameExtractFullName
(
name
,
tbFName
);
tNameExtractFullName
(
name
,
tbFName
);
...
@@ -978,7 +980,7 @@ int32_t ctgGetUdfInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const ch
...
@@ -978,7 +980,7 @@ int32_t ctgGetUdfInfoFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const ch
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_RETRIEVE_FUNC
;
int32_t
reqType
=
TDMT_MND_RETRIEVE_FUNC
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get udf info from mnode, funcName:%s"
,
funcName
);
ctgDebug
(
"try to get udf info from mnode, funcName:%s"
,
funcName
);
...
@@ -1033,7 +1035,7 @@ int32_t ctgGetUserDbAuthFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const
...
@@ -1033,7 +1035,7 @@ int32_t ctgGetUserDbAuthFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_GET_USER_AUTH
;
int32_t
reqType
=
TDMT_MND_GET_USER_AUTH
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get user auth from mnode, user:%s"
,
user
);
ctgDebug
(
"try to get user auth from mnode, user:%s"
,
user
);
...
@@ -1093,7 +1095,7 @@ int32_t ctgGetTbMetaFromMnodeImpl(SCatalog* pCtg, SRequestConnInfo* pConn, char*
...
@@ -1093,7 +1095,7 @@ int32_t ctgGetTbMetaFromMnodeImpl(SCatalog* pCtg, SRequestConnInfo* pConn, char*
int32_t
reqType
=
TDMT_MND_TABLE_META
;
int32_t
reqType
=
TDMT_MND_TABLE_META
;
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
sprintf
(
tbFName
,
"%s.%s"
,
dbFName
,
tbName
);
sprintf
(
tbFName
,
"%s.%s"
,
dbFName
,
tbName
);
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
ctgDebug
(
"try to get table meta from mnode, tbFName:%s"
,
tbFName
);
ctgDebug
(
"try to get table meta from mnode, tbFName:%s"
,
tbFName
);
...
@@ -1156,7 +1158,7 @@ int32_t ctgGetTbMetaFromVnode(SCatalog* pCtg, SRequestConnInfo* pConn, const SNa
...
@@ -1156,7 +1158,7 @@ int32_t ctgGetTbMetaFromVnode(SCatalog* pCtg, SRequestConnInfo* pConn, const SNa
int32_t
reqType
=
TDMT_VND_TABLE_META
;
int32_t
reqType
=
TDMT_VND_TABLE_META
;
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
sprintf
(
tbFName
,
"%s.%s"
,
dbFName
,
pTableName
->
tname
);
sprintf
(
tbFName
,
"%s.%s"
,
dbFName
,
pTableName
->
tname
);
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
SEp
*
pEp
=
&
vgroupInfo
->
epSet
.
eps
[
vgroupInfo
->
epSet
.
inUse
];
SEp
*
pEp
=
&
vgroupInfo
->
epSet
.
eps
[
vgroupInfo
->
epSet
.
inUse
];
ctgDebug
(
"try to get table meta from vnode, vgId:%d, ep num:%d, ep %s:%d, tbFName:%s"
,
vgroupInfo
->
vgId
,
ctgDebug
(
"try to get table meta from vnode, vgId:%d, ep num:%d, ep %s:%d, tbFName:%s"
,
vgroupInfo
->
vgId
,
...
@@ -1225,7 +1227,7 @@ int32_t ctgGetTableCfgFromVnode(SCatalog* pCtg, SRequestConnInfo* pConn, const S
...
@@ -1225,7 +1227,7 @@ int32_t ctgGetTableCfgFromVnode(SCatalog* pCtg, SRequestConnInfo* pConn, const S
int32_t
reqType
=
TDMT_VND_TABLE_CFG
;
int32_t
reqType
=
TDMT_VND_TABLE_CFG
;
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
tNameExtractFullName
(
pTableName
,
tbFName
);
tNameExtractFullName
(
pTableName
,
tbFName
);
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
char
dbFName
[
TSDB_DB_FNAME_LEN
];
char
dbFName
[
TSDB_DB_FNAME_LEN
];
tNameGetFullDbName
(
pTableName
,
dbFName
);
tNameGetFullDbName
(
pTableName
,
dbFName
);
SBuildTableInput
bInput
=
{.
vgId
=
vgroupInfo
->
vgId
,
.
dbFName
=
dbFName
,
.
tbName
=
(
char
*
)
pTableName
->
tname
};
SBuildTableInput
bInput
=
{.
vgId
=
vgroupInfo
->
vgId
,
.
dbFName
=
dbFName
,
.
tbName
=
(
char
*
)
pTableName
->
tname
};
...
@@ -1290,7 +1292,7 @@ int32_t ctgGetTableCfgFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const S
...
@@ -1290,7 +1292,7 @@ int32_t ctgGetTableCfgFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, const S
int32_t
reqType
=
TDMT_MND_TABLE_CFG
;
int32_t
reqType
=
TDMT_MND_TABLE_CFG
;
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
char
tbFName
[
TSDB_TABLE_FNAME_LEN
];
tNameExtractFullName
(
pTableName
,
tbFName
);
tNameExtractFullName
(
pTableName
,
tbFName
);
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
char
dbFName
[
TSDB_DB_FNAME_LEN
];
char
dbFName
[
TSDB_DB_FNAME_LEN
];
tNameGetFullDbName
(
pTableName
,
dbFName
);
tNameGetFullDbName
(
pTableName
,
dbFName
);
SBuildTableInput
bInput
=
{.
vgId
=
0
,
.
dbFName
=
dbFName
,
.
tbName
=
(
char
*
)
pTableName
->
tname
};
SBuildTableInput
bInput
=
{.
vgId
=
0
,
.
dbFName
=
dbFName
,
.
tbName
=
(
char
*
)
pTableName
->
tname
};
...
@@ -1342,7 +1344,7 @@ int32_t ctgGetSvrVerFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, char** ou
...
@@ -1342,7 +1344,7 @@ int32_t ctgGetSvrVerFromMnode(SCatalog* pCtg, SRequestConnInfo* pConn, char** ou
char
*
msg
=
NULL
;
char
*
msg
=
NULL
;
int32_t
msgLen
=
0
;
int32_t
msgLen
=
0
;
int32_t
reqType
=
TDMT_MND_SERVER_VERSION
;
int32_t
reqType
=
TDMT_MND_SERVER_VERSION
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
taosMemoryMalloc
:
rpcMallocCont
;
void
*
(
*
mallocFp
)(
int64_t
)
=
pTask
?
(
MallocType
)
taosMemoryMalloc
:
(
MallocType
)
rpcMallocCont
;
qDebug
(
"try to get svr ver from mnode"
);
qDebug
(
"try to get svr ver from mnode"
);
...
...
source/libs/stream/CMakeLists.txt
浏览文件 @
86fe2169
...
@@ -3,7 +3,6 @@ add_library(stream STATIC ${STREAM_SRC})
...
@@ -3,7 +3,6 @@ add_library(stream STATIC ${STREAM_SRC})
target_include_directories
(
target_include_directories
(
stream
stream
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/stream"
PUBLIC
"
${
TD_SOURCE_DIR
}
/include/libs/stream"
PUBLIC
"
${
TD_SOURCE_DIR
}
/contrib/rocksdb/include"
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc"
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc"
)
)
...
@@ -13,6 +12,11 @@ if(${BUILD_WITH_ROCKSDB})
...
@@ -13,6 +12,11 @@ if(${BUILD_WITH_ROCKSDB})
PUBLIC rocksdb tdb
PUBLIC rocksdb tdb
PRIVATE os util transport qcom executor
PRIVATE os util transport qcom executor
)
)
target_include_directories
(
stream
PUBLIC
"
${
TD_SOURCE_DIR
}
/contrib/rocksdb/include"
)
add_definitions
(
-DUSE_ROCKSDB
)
add_definitions
(
-DUSE_ROCKSDB
)
endif
(
${
BUILD_WITH_ROCKSDB
}
)
endif
(
${
BUILD_WITH_ROCKSDB
}
)
...
...
source/os/src/osMemory.c
浏览文件 @
86fe2169
...
@@ -254,63 +254,64 @@ int32_t taosMemoryDbgInitRestore() {
...
@@ -254,63 +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
;
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
pTdMemoryInfo
->
memorySize
=
size
;
// pTdMemoryInfo->memorySize = size;
pTdMemoryInfo
->
symbol
=
TD_MEMORY_SYMBOL
;
// pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
taosBackTrace
(
pTdMemoryInfo
->
stackTrace
,
TD_MEMORY_STACK_TRACE_DEPTH
);
// taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
return
(
char
*
)
tmp
+
sizeof
(
TdMemoryInfo
);
// return (char *)tmp + sizeof(TdMemoryInfo);
#else
// #else
return
malloc
(
size
);
// return malloc(size);
#endif
// #endif
}
// }
void
*
taosMemoryCalloc
(
int64_t
num
,
int64_t
size
)
{
#ifdef USE_TD_MEMORY
int32_t
memorySize
=
num
*
size
;
char
*
tmp
=
calloc
(
memorySize
+
sizeof
(
TdMemoryInfo
),
1
);
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
);
// void *taosMemoryCalloc(int64_t num, int64_t size) {
#else
// #ifdef USE_TD_MEMORY
return
calloc
(
num
,
size
);
// int32_t memorySize = num * size;
#endif
// char *tmp = calloc(memorySize + sizeof(TdMemoryInfo), 1);
}
// 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
)
{
//
void *taosMemoryRealloc(void *ptr, int64_t size) {
#ifdef USE_TD_MEMORY
//
#ifdef USE_TD_MEMORY
if
(
ptr
==
NULL
)
return
taosMemoryMalloc
(
size
);
//
if (ptr == NULL) return taosMemoryMalloc(size);
TdMemoryInfoPtr
pTdMemoryInfo
=
(
TdMemoryInfoPtr
)((
char
*
)
ptr
-
sizeof
(
TdMemoryInfo
));
// TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
ASSERT
(
pTdMemoryInfo
->
symbol
==
TD_MEMORY_SYMBOL
);
// ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
if
(
tpTdMemoryInfo
->
symbol
!=
TD_MEMORY_SYMBOL
)
{
// if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
+
return
NULL
;
// +return NULL;
+
}
// +
// }
TdMemoryInfo
tdMemoryInfo
;
//
TdMemoryInfo tdMemoryInfo;
memcpy
(
&
tdMemoryInfo
,
pTdMemoryInfo
,
sizeof
(
TdMemoryInfo
));
//
memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo));
void
*
tmp
=
realloc
(
pTdMemoryInfo
,
size
+
sizeof
(
TdMemoryInfo
));
//
void *tmp = realloc(pTdMemoryInfo, size + sizeof(TdMemoryInfo));
if
(
tmp
==
NULL
)
return
NULL
;
//
if (tmp == NULL) return NULL;
memcpy
(
tmp
,
&
tdMemoryInfo
,
sizeof
(
TdMemoryInfo
));
//
memcpy(tmp, &tdMemoryInfo, sizeof(TdMemoryInfo));
((
TdMemoryInfoPtr
)
tmp
)
->
memorySize
=
size
;
//
((TdMemoryInfoPtr)tmp)->memorySize = size;
return
(
char
*
)
tmp
+
sizeof
(
TdMemoryInfo
);
//
return (char *)tmp + sizeof(TdMemoryInfo);
#else
//
#else
return
realloc
(
ptr
,
size
);
//
return realloc(ptr, size);
#endif
//
#endif
}
//
}
char
*
taosStrdup
(
const
char
*
ptr
)
{
char
*
taosStrdup
(
const
char
*
ptr
)
{
#ifdef USE_TD_MEMORY
#ifdef USE_TD_MEMORY
...
@@ -319,8 +320,8 @@ char *taosStrdup(const char *ptr) {
...
@@ -319,8 +320,8 @@ char *taosStrdup(const char *ptr) {
TdMemoryInfoPtr
pTdMemoryInfo
=
(
TdMemoryInfoPtr
)((
char
*
)
ptr
-
sizeof
(
TdMemoryInfo
));
TdMemoryInfoPtr
pTdMemoryInfo
=
(
TdMemoryInfoPtr
)((
char
*
)
ptr
-
sizeof
(
TdMemoryInfo
));
ASSERT
(
pTdMemoryInfo
->
symbol
==
TD_MEMORY_SYMBOL
);
ASSERT
(
pTdMemoryInfo
->
symbol
==
TD_MEMORY_SYMBOL
);
if
(
pTdMemoryInfo
->
symbol
!=
TD_MEMORY_SYMBOL
)
{
if
(
pTdMemoryInfo
->
symbol
!=
TD_MEMORY_SYMBOL
)
{
return
NULL
;
return
NULL
;
}
}
void
*
tmp
=
tstrdup
(
pTdMemoryInfo
);
void
*
tmp
=
tstrdup
(
pTdMemoryInfo
);
if
(
tmp
==
NULL
)
return
NULL
;
if
(
tmp
==
NULL
)
return
NULL
;
...
@@ -333,21 +334,21 @@ char *taosStrdup(const char *ptr) {
...
@@ -333,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
;
...
@@ -356,8 +357,9 @@ int64_t taosMemorySize(void *ptr) {
...
@@ -356,8 +357,9 @@ int64_t taosMemorySize(void *ptr) {
TdMemoryInfoPtr
pTdMemoryInfo
=
(
TdMemoryInfoPtr
)((
char
*
)
ptr
-
sizeof
(
TdMemoryInfo
));
TdMemoryInfoPtr
pTdMemoryInfo
=
(
TdMemoryInfoPtr
)((
char
*
)
ptr
-
sizeof
(
TdMemoryInfo
));
ASSERT
(
pTdMemoryInfo
->
symbol
==
TD_MEMORY_SYMBOL
);
ASSERT
(
pTdMemoryInfo
->
symbol
==
TD_MEMORY_SYMBOL
);
if
(
pTdMemoryInfo
->
symbol
!=
TD_MEMORY_SYMBOL
)
{
if
(
pTdMemoryInfo
->
symbol
!=
TD_MEMORY_SYMBOL
)
{
+
return
NULL
;
+
return
NULL
;
+
}
+
}
return
pTdMemoryInfo
->
memorySize
;
return
pTdMemoryInfo
->
memorySize
;
#else
#else
...
@@ -380,12 +382,12 @@ void taosMemoryTrim(int32_t size) {
...
@@ -380,12 +382,12 @@ void taosMemoryTrim(int32_t size) {
#endif
#endif
}
}
void
*
taosMemoryMallocAlign
(
uint32_t
alignment
,
int64_t
size
)
{
void
*
taosMemoryMallocAlign
(
uint32_t
alignment
,
int64_t
size
)
{
#ifdef USE_TD_MEMORY
#ifdef USE_TD_MEMORY
ASSERT
(
0
);
ASSERT
(
0
);
#else
#else
#if defined(LINUX)
#if defined(LINUX)
void
*
p
=
memalign
(
alignment
,
size
);
void
*
p
=
memalign
(
alignment
,
size
);
return
p
;
return
p
;
#else
#else
return
taosMemoryMalloc
(
size
);
return
taosMemoryMalloc
(
size
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录