Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
9eabf5fd
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
9eabf5fd
编写于
11月 11, 2019
作者:
S
slguan
提交者:
GitHub
11月 11, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #695 from taosdata/feature/newtimer
Feature/newtimer
上级
73516d5d
48c60fd0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
42 addition
and
21 deletion
+42
-21
src/inc/tglobalcfg.h
src/inc/tglobalcfg.h
+2
-0
src/inc/ttimer.h
src/inc/ttimer.h
+1
-1
src/util/src/tglobalcfg.c
src/util/src/tglobalcfg.c
+5
-0
src/util/src/ttimer.c
src/util/src/ttimer.c
+34
-20
未找到文件。
src/inc/tglobalcfg.h
浏览文件 @
9eabf5fd
...
...
@@ -169,6 +169,8 @@ extern uint32_t debugFlag;
extern
uint32_t
odbcdebugFlag
;
extern
uint32_t
qdebugFlag
;
extern
uint32_t
taosMaxTmrCtrl
;
extern
int
tsRpcTimer
;
extern
int
tsRpcMaxTime
;
extern
int
tsUdpDelay
;
...
...
src/inc/ttimer.h
浏览文件 @
9eabf5fd
...
...
@@ -25,6 +25,7 @@ typedef void (*TAOS_TMR_CALLBACK)(void *, void *);
extern
uint32_t
tmrDebugFlag
;
extern
int
taosTmrThreads
;
extern
uint32_t
taosMaxTmrCtrl
;
#define tmrError(...) \
do { if (tmrDebugFlag & DEBUG_ERROR) { \
...
...
@@ -41,7 +42,6 @@ extern int taosTmrThreads;
tprintf("TMR ", tmrDebugFlag, __VA_ARGS__); \
} } while(0)
#define MAX_NUM_OF_TMRCTL 512
#define MSECONDS_PER_TICK 5
void
*
taosTmrInit
(
int
maxTmr
,
int
resoultion
,
int
longest
,
const
char
*
label
);
...
...
src/util/src/tglobalcfg.c
浏览文件 @
9eabf5fd
...
...
@@ -536,6 +536,11 @@ void tsInitGlobalConfig() {
0
,
2
,
0
,
TSDB_CFG_UTYPE_NONE
);
// 0-any, 1-mgmt, 2-dnode
// timer
tsInitConfigOption
(
cfg
++
,
"maxTmrCtrl"
,
&
taosMaxTmrCtrl
,
TSDB_CFG_VTYPE_INT
,
TSDB_CFG_CTYPE_B_CONFIG
|
TSDB_CFG_CTYPE_B_SHOW
|
TSDB_CFG_CTYPE_B_CLUSTER
,
8
,
2048
,
0
,
TSDB_CFG_UTYPE_NONE
);
// time
tsInitConfigOption
(
cfg
++
,
"monitorInterval"
,
&
tsMonitorInterval
,
TSDB_CFG_VTYPE_INT
,
TSDB_CFG_CTYPE_B_CONFIG
,
...
...
src/util/src/ttimer.c
浏览文件 @
9eabf5fd
...
...
@@ -82,13 +82,16 @@ typedef struct time_wheel_t {
}
time_wheel_t
;
uint32_t
tmrDebugFlag
=
DEBUG_ERROR
|
DEBUG_WARN
|
DEBUG_FILE
;
uint32_t
taosMaxTmrCtrl
=
512
;
static
pthread_once_t
tmrModuleInit
=
PTHREAD_ONCE_INIT
;
static
pthread_mutex_t
tmrCtrlMutex
;
static
tmr_ctrl_t
tmrCtrls
[
MAX_NUM_OF_TMRCTL
]
;
static
tmr_ctrl_t
*
tmrCtrls
;
static
tmr_ctrl_t
*
unusedTmrCtrl
=
NULL
;
void
*
tmrQhandle
;
int
taosTmrThreads
=
1
;
static
void
*
tmrQhandle
;
static
int
numOfTmrCtrl
=
0
;
int
taosTmrThreads
=
1
;
static
uintptr_t
nextTimerId
=
0
;
...
...
@@ -129,7 +132,7 @@ static void unlockTimerList(timer_list_t* list) {
int64_t
tid
=
taosGetPthreadId
();
if
(
__sync_val_compare_and_swap_64
(
&
(
list
->
lockedBy
),
tid
,
0
)
!=
tid
)
{
assert
(
false
);
tmrError
(
"
trying to unlock a timer list not locked by current thread."
);
tmrError
(
"
%d trying to unlock a timer list not locked by current thread."
,
tid
);
}
}
...
...
@@ -256,13 +259,13 @@ static void processExpiredTimer(void* handle, void* arg) {
timer
->
executedBy
=
taosGetPthreadId
();
uint8_t
state
=
__sync_val_compare_and_swap_8
(
&
timer
->
state
,
TIMER_STATE_WAITING
,
TIMER_STATE_EXPIRED
);
if
(
state
==
TIMER_STATE_WAITING
)
{
const
char
*
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] execution start."
;
const
char
*
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] execution start."
;
tmrTrace
(
fmt
,
timer
->
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
(
*
timer
->
fp
)(
timer
->
param
,
(
tmr_h
)
timer
->
id
);
atomic_store_8
(
&
timer
->
state
,
TIMER_STATE_STOPPED
);
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] execution end."
;
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] execution end."
;
tmrTrace
(
fmt
,
timer
->
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
}
removeTimer
(
timer
->
id
);
...
...
@@ -270,18 +273,21 @@ static void processExpiredTimer(void* handle, void* arg) {
}
static
void
addToExpired
(
tmr_obj_t
*
head
)
{
const
char
*
fmt
=
"
timer[label=%s, id=%lld, fp=%p, param=%p] expired
"
;
const
char
*
fmt
=
"
%s adding expired timer[id=%lld, fp=%p, param=%p] to queue.
"
;
while
(
head
!=
NULL
)
{
tmrTrace
(
fmt
,
head
->
ctrl
->
label
,
head
->
id
,
head
->
fp
,
head
->
param
);
uintptr_t
id
=
head
->
id
;
tmr_obj_t
*
next
=
head
->
next
;
tmrTrace
(
fmt
,
head
->
ctrl
->
label
,
id
,
head
->
fp
,
head
->
param
);
SSchedMsg
schedMsg
;
schedMsg
.
fp
=
NULL
;
schedMsg
.
tfp
=
processExpiredTimer
;
schedMsg
.
ahandle
=
head
;
schedMsg
.
thandle
=
NULL
;
taosScheduleTask
(
tmrQhandle
,
&
schedMsg
);
tmrTrace
(
"timer[id=%lld] has been added to queue."
,
id
);
head
=
next
;
}
}
...
...
@@ -295,7 +301,7 @@ static uintptr_t doStartTimer(tmr_obj_t* timer, TAOS_TMR_CALLBACK fp, int msecon
timer
->
ctrl
=
ctrl
;
addTimer
(
timer
);
const
char
*
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] started"
;
const
char
*
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] started"
;
tmrTrace
(
fmt
,
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
if
(
mseconds
==
0
)
{
...
...
@@ -318,7 +324,7 @@ tmr_h taosTmrStart(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle
tmr_obj_t
*
timer
=
(
tmr_obj_t
*
)
calloc
(
1
,
sizeof
(
tmr_obj_t
));
if
(
timer
==
NULL
)
{
tmrError
(
"
failed to allocated memory for new timer object."
);
tmrError
(
"
%s failed to allocated memory for new timer object."
,
ctrl
->
label
);
return
NULL
;
}
...
...
@@ -389,7 +395,7 @@ static bool doStopTimer(tmr_obj_t* timer, uint8_t state) {
// we cannot guarantee the thread safety of the timr in all other cases.
reusable
=
true
;
}
const
char
*
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] is cancelled."
;
const
char
*
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] is cancelled."
;
tmrTrace
(
fmt
,
timer
->
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
}
else
if
(
state
!=
TIMER_STATE_EXPIRED
)
{
// timer already stopped or cancelled, has nothing to do in this case
...
...
@@ -400,7 +406,7 @@ static bool doStopTimer(tmr_obj_t* timer, uint8_t state) {
}
else
{
assert
(
timer
->
executedBy
!=
taosGetPthreadId
());
const
char
*
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] fired, waiting..."
;
const
char
*
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] fired, waiting..."
;
tmrTrace
(
fmt
,
timer
->
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
for
(
int
i
=
1
;
atomic_load_8
(
&
timer
->
state
)
!=
TIMER_STATE_STOPPED
;
i
++
)
{
...
...
@@ -409,7 +415,7 @@ static bool doStopTimer(tmr_obj_t* timer, uint8_t state) {
}
}
fmt
=
"
timer[label=%s,
id=%lld, fp=%p, param=%p] stopped."
;
fmt
=
"
%s timer[
id=%lld, fp=%p, param=%p] stopped."
;
tmrTrace
(
fmt
,
timer
->
ctrl
->
label
,
timer
->
id
,
timer
->
fp
,
timer
->
param
);
}
...
...
@@ -448,7 +454,7 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
bool
stopped
=
false
;
tmr_obj_t
*
timer
=
findTimer
(
id
);
if
(
timer
==
NULL
)
{
tmrTrace
(
"
timer[id=%lld] does not exist"
,
id
);
tmrTrace
(
"
%s timer[id=%lld] does not exist"
,
ctrl
->
label
,
id
);
}
else
{
uint8_t
state
=
__sync_val_compare_and_swap_8
(
&
timer
->
state
,
TIMER_STATE_WAITING
,
TIMER_STATE_CANCELED
);
if
(
!
doStopTimer
(
timer
,
state
))
{
...
...
@@ -463,7 +469,7 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
return
stopped
;
}
tmrTrace
(
"
timer[id=%lld] is reused"
,
timer
->
id
);
tmrTrace
(
"
%s timer[id=%lld] is reused"
,
ctrl
->
label
,
timer
->
id
);
// wait until there's no other reference to this timer,
// so that we can reuse this timer safely.
...
...
@@ -481,7 +487,13 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
}
static
void
taosTmrModuleInit
(
void
)
{
for
(
int
i
=
0
;
i
<
tListLen
(
tmrCtrls
)
-
1
;
++
i
)
{
tmrCtrls
=
malloc
(
sizeof
(
tmr_ctrl_t
)
*
taosMaxTmrCtrl
);
if
(
tmrCtrls
==
NULL
)
{
tmrError
(
"failed to allocate memory for timer controllers."
);
return
;
}
for
(
int
i
=
0
;
i
<
taosMaxTmrCtrl
-
1
;
++
i
)
{
tmr_ctrl_t
*
ctrl
=
tmrCtrls
+
i
;
ctrl
->
next
=
ctrl
+
1
;
}
...
...
@@ -526,17 +538,18 @@ void* taosTmrInit(int maxNumOfTmrs, int resolution, int longest, const char* lab
tmr_ctrl_t
*
ctrl
=
unusedTmrCtrl
;
if
(
ctrl
!=
NULL
)
{
unusedTmrCtrl
=
ctrl
->
next
;
numOfTmrCtrl
++
;
}
pthread_mutex_unlock
(
&
tmrCtrlMutex
);
if
(
ctrl
==
NULL
)
{
tmrError
(
"
too many timer controllers, failed to create timer controller[label=%s]
."
,
label
);
tmrError
(
"
%s too many timer controllers, failed to create timer controller
."
,
label
);
return
NULL
;
}
strncpy
(
ctrl
->
label
,
label
,
sizeof
(
ctrl
->
label
));
ctrl
->
label
[
sizeof
(
ctrl
->
label
)
-
1
]
=
0
;
tmrTrace
(
"
timer controller[label=%s] is initialized."
,
labe
l
);
tmrTrace
(
"
%s timer controller is initialized, number of timer controllers: %d."
,
label
,
numOfTmrCtr
l
);
return
ctrl
;
}
...
...
@@ -544,11 +557,12 @@ void taosTmrCleanUp(void* handle) {
tmr_ctrl_t
*
ctrl
=
(
tmr_ctrl_t
*
)
handle
;
assert
(
ctrl
!=
NULL
&&
ctrl
->
label
[
0
]
!=
0
);
tmrTrace
(
"
timer controller[label=%s]
is cleaned up."
,
ctrl
->
label
);
tmrTrace
(
"
%s timer controller
is cleaned up."
,
ctrl
->
label
);
ctrl
->
label
[
0
]
=
0
;
pthread_mutex_lock
(
&
tmrCtrlMutex
);
ctrl
->
next
=
unusedTmrCtrl
;
numOfTmrCtrl
--
;
unusedTmrCtrl
=
ctrl
;
pthread_mutex_unlock
(
&
tmrCtrlMutex
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录