Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
90ff3485
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
90ff3485
编写于
9月 05, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/taosdata/TDengine
上级
88780e30
8914c0cc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
18 deletion
+19
-18
src/util/src/tmempool.c
src/util/src/tmempool.c
+19
-18
未找到文件。
src/util/src/tmempool.c
浏览文件 @
90ff3485
...
...
@@ -64,6 +64,7 @@ mpool_h taosMemPoolInit(int numOfBlock, int blockSize) {
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
;
pool_p
->
first
=
0
;
...
...
@@ -78,9 +79,7 @@ char *taosMemPoolMalloc(mpool_h handle) {
pthread_mutex_lock
(
&
(
pool_p
->
mutex
));
if
(
pool_p
->
numOfFree
<=
0
)
{
pTrace
(
"mempool: out of memory"
);
}
else
{
if
(
pool_p
->
numOfFree
>
0
)
{
pos
=
pool_p
->
pool
+
pool_p
->
blockSize
*
(
pool_p
->
freeList
[
pool_p
->
first
]);
pool_p
->
first
++
;
pool_p
->
first
=
pool_p
->
first
%
pool_p
->
numOfBlock
;
...
...
@@ -88,7 +87,8 @@ char *taosMemPoolMalloc(mpool_h handle) {
}
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
;
}
...
...
@@ -98,24 +98,25 @@ void taosMemPoolFree(mpool_h handle, char *pMem) {
if
(
pMem
==
NULL
)
return
;
pthread_mutex_lock
(
&
pool_p
->
mutex
);
index
=
(
int
)(
pMem
-
pool_p
->
pool
)
%
pool_p
->
blockSize
;
if
(
index
!=
0
)
{
pError
(
"invalid free address:%p
\n
"
,
pMem
);
}
else
{
index
=
(
int
)((
pMem
-
pool_p
->
pool
)
/
pool_p
->
blockSize
);
if
(
index
<
0
||
index
>=
pool_p
->
numOfBlock
)
{
pError
(
"mempool: error, invalid address:%p
\n
"
,
pMem
);
}
else
{
pool_p
->
freeList
[(
pool_p
->
first
+
pool_p
->
numOfFree
)
%
pool_p
->
numOfBlock
]
=
index
;
pool_p
->
numOfFree
++
;
memset
(
pMem
,
0
,
(
size_t
)
pool_p
->
blockSize
);
}
return
;
}
index
=
(
int
)((
pMem
-
pool_p
->
pool
)
/
pool_p
->
blockSize
);
if
(
index
<
0
||
index
>=
pool_p
->
numOfBlock
)
{
pError
(
"mempool: error, invalid address:%p
\n
"
,
pMem
);
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
->
numOfFree
++
;
pthread_mutex_unlock
(
&
pool_p
->
mutex
);
}
...
...
@@ -125,6 +126,6 @@ void taosMemPoolCleanUp(mpool_h handle) {
pthread_mutex_destroy
(
&
pool_p
->
mutex
);
if
(
pool_p
->
pool
)
free
(
pool_p
->
pool
);
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
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录