Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
1ddd7336
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,发现更多精彩内容 >>
提交
1ddd7336
编写于
9月 05, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert pull request #310
Because some use cases cannot pass
上级
47ae0423
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
19 addition
and
59 deletion
+19
-59
src/util/src/ttimer.c
src/util/src/ttimer.c
+19
-59
未找到文件。
src/util/src/ttimer.c
浏览文件 @
1ddd7336
...
...
@@ -78,13 +78,8 @@ typedef struct {
int
count
;
}
tmr_list_t
;
#define TMR_CTRL_STAGE_UNUSED 0
#define TMR_CTRL_STAGE_IN_USE 1
#define TMR_CTRL_STAGE_CLEANNING_UP 2
typedef
struct
_tmr_ctrl_t
{
int
stage
;
/* life cycle stage of this tmr ctrl */
void
*
signature
;
pthread_mutex_t
mutex
;
/* mutex to protect critical resource */
int
resolution
;
/* resolution in mseconds */
int
numOfPeriods
;
/* total number of periods */
...
...
@@ -115,37 +110,15 @@ void *taosTimerLoopFunc(int signo) {
for
(
int
i
=
1
;
i
<
maxNumOfTmrCtrl
;
++
i
)
{
pCtrl
=
tmrCtrl
+
i
;
// save 'stage' to a local variable so that all later code can
// use the same 'stage'. acquire semantic is required to ensure
// 'stage' is load before other 'pCtrl' fields.
int
stage
=
__atomic_load_n
(
&
pCtrl
->
stage
,
__ATOMIC_ACQUIRE
);
if
(
stage
==
TMR_CTRL_STAGE_IN_USE
)
{
if
(
pCtrl
->
signature
)
{
count
++
;
pCtrl
->
ticks
++
;
if
(
pCtrl
->
ticks
>=
pCtrl
->
maxTicks
)
{
taosTmrProcessList
(
pCtrl
);
pCtrl
->
ticks
=
0
;
}
}
else
if
(
stage
==
TMR_CTRL_STAGE_CLEANNING_UP
)
{
__atomic_store_n
(
&
pCtrl
->
stage
,
TMR_CTRL_STAGE_UNUSED
,
__ATOMIC_RELEASE
);
pthread_mutex_destroy
(
&
pCtrl
->
mutex
);
tfree
(
pCtrl
->
tmrList
);
tmrMemPoolCleanUp
(
pCtrl
->
poolHandle
);
// decrease 'numOfTmrCtrl', need to be atomic but relaxed semantic is fine
// because we don't need (unable to guarantee either) an accurate counter.
int
num
=
__atomic_add_fetch
(
&
numOfTmrCtrl
,
-
1
,
__ATOMIC_RELAXED
);
tmrTrace
(
"%s is cleaned up, numOfTmrCtrls:%d"
,
pCtrl
->
label
,
num
);
// return 'id' to the poool and then this timer controller can be reused,
// this must be the last step.
taosFreeId
(
tmrIdPool
,
pCtrl
->
tmrCtrlId
);
}
else
{
continue
;
if
(
count
>=
numOfTmrCtrl
)
break
;
}
if
(
++
count
>=
__atomic_load_n
(
&
numOfTmrCtrl
,
__ATOMIC_RELAXED
))
break
;
}
return
NULL
;
...
...
@@ -233,6 +206,9 @@ void *taosTmrInit(int maxNumOfTmrs, int resolution, int longest, char *label) {
}
pCtrl
=
tmrCtrl
+
tmrCtrlId
;
tfree
(
pCtrl
->
tmrList
);
tmrMemPoolCleanUp
(
pCtrl
->
poolHandle
);
memset
(
pCtrl
,
0
,
sizeof
(
tmr_ctrl_t
));
pCtrl
->
tmrCtrlId
=
tmrCtrlId
;
...
...
@@ -241,25 +217,18 @@ void *taosTmrInit(int maxNumOfTmrs, int resolution, int longest, char *label) {
if
((
pCtrl
->
poolHandle
=
tmrMemPoolInit
(
maxNumOfTmrs
+
10
,
sizeof
(
tmr_obj_t
)))
==
NULL
)
{
tmrError
(
"%s failed to allocate mem pool"
,
label
);
t
aosFreeId
(
tmrIdPool
,
tmrCtrlId
);
t
mrMemPoolCleanUp
(
pCtrl
->
poolHandle
);
return
NULL
;
}
if
(
resolution
<
MSECONDS_PER_TICK
)
resolution
=
MSECONDS_PER_TICK
;
pCtrl
->
resolution
=
resolution
;
pCtrl
->
maxTicks
=
resolution
/
MSECONDS_PER_TICK
;
pCtrl
->
ticks
=
rand
()
%
pCtrl
->
maxTicks
;
pCtrl
->
ticks
=
rand
()
/
pCtrl
->
maxTicks
;
pCtrl
->
numOfPeriods
=
longest
/
resolution
;
if
(
pCtrl
->
numOfPeriods
<
10
)
pCtrl
->
numOfPeriods
=
10
;
pCtrl
->
tmrList
=
(
tmr_list_t
*
)
malloc
(
sizeof
(
tmr_list_t
)
*
pCtrl
->
numOfPeriods
);
if
(
pCtrl
->
tmrList
==
NULL
)
{
tmrError
(
"%s failed to allocate tmrList"
,
label
);
tmrMemPoolCleanUp
(
pCtrl
->
poolHandle
);
taosFreeId
(
tmrIdPool
,
tmrCtrlId
);
return
NULL
;
}
for
(
int
i
=
0
;
i
<
pCtrl
->
numOfPeriods
;
i
++
)
{
pCtrl
->
tmrList
[
i
].
head
=
NULL
;
pCtrl
->
tmrList
[
i
].
count
=
0
;
...
...
@@ -267,20 +236,12 @@ void *taosTmrInit(int maxNumOfTmrs, int resolution, int longest, char *label) {
if
(
pthread_mutex_init
(
&
pCtrl
->
mutex
,
NULL
)
<
0
)
{
tmrError
(
"%s failed to create the mutex, reason:%s"
,
label
,
strerror
(
errno
));
free
(
pCtrl
->
tmrList
);
tmrMemPoolCleanUp
(
pCtrl
->
poolHandle
);
taosFreeId
(
tmrIdPool
,
tmrCtrlId
);
taosTmrCleanUp
(
pCtrl
);
return
NULL
;
}
// set 'stage' to 'in use' to mark the completion of initialization,
// release semantic is required to ensure all operations prior this
// are visible to other threads first.
__atomic_store_n
(
&
pCtrl
->
stage
,
TMR_CTRL_STAGE_IN_USE
,
__ATOMIC_RELEASE
);
// increase 'numOfTmrCtrl', need to be atomic but relaxed semantic is fine
__atomic_add_fetch
(
&
numOfTmrCtrl
,
1
,
__ATOMIC_RELAXED
);
pCtrl
->
signature
=
pCtrl
;
numOfTmrCtrl
++
;
tmrTrace
(
"%s timer ctrl is initialized, index:%d"
,
label
,
tmrCtrlId
);
return
pCtrl
;
}
...
...
@@ -332,14 +293,12 @@ void taosTmrProcessList(tmr_ctrl_t *pCtrl) {
void
taosTmrCleanUp
(
void
*
handle
)
{
tmr_ctrl_t
*
pCtrl
=
(
tmr_ctrl_t
*
)
handle
;
if
(
pCtrl
==
NULL
)
return
;
if
(
pCtrl
==
NULL
||
pCtrl
->
signature
!=
pCtrl
)
return
;
// set 'stage' to 'cleanning up' if it is 'in use' atomically,
// actual cleanning up will be done in 'taosTimerLoopFunc'.
int
oldStage
=
TMR_CTRL_STAGE_IN_USE
;
__atomic_compare_exchange_n
(
&
pCtrl
->
stage
,
&
oldStage
,
TMR_CTRL_STAGE_CLEANNING_UP
,
false
,
__ATOMIC_ACQ_REL
,
__ATOMIC_ACQUIRE
);
pCtrl
->
signature
=
NULL
;
taosFreeId
(
tmrIdPool
,
pCtrl
->
tmrCtrlId
);
numOfTmrCtrl
--
;
tmrTrace
(
"%s is cleaned up, numOfTmrs:%d"
,
pCtrl
->
label
,
numOfTmrCtrl
);
}
tmr_h
taosTmrStart
(
void
(
*
fp
)(
void
*
,
void
*
),
int
mseconds
,
void
*
param1
,
void
*
handle
)
{
...
...
@@ -579,6 +538,7 @@ mpool_h tmrMemPoolInit(int numOfBlock, int blockSize) {
pool_p
->
blockSize
=
blockSize
;
pool_p
->
numOfBlock
=
numOfBlock
;
pool_p
->
pool
=
(
char
*
)
malloc
(
blockSize
*
numOfBlock
);
memset
(
pool_p
->
pool
,
0
,
blockSize
*
numOfBlock
);
pool_p
->
freeList
=
(
int
*
)
malloc
(
sizeof
(
int
)
*
numOfBlock
);
if
(
pool_p
->
pool
==
NULL
||
pool_p
->
freeList
==
NULL
)
{
...
...
@@ -636,6 +596,6 @@ void tmrMemPoolCleanUp(mpool_h handle) {
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录