This commit is contained in:
aozhiwei 2019-06-25 19:01:02 +08:00
parent 492cb88b82
commit bb10963a71

View File

@ -292,25 +292,27 @@ namespace a8
if (timer->timer_after_func) { if (timer->timer_after_func) {
timer->timer_after_func(timer->param); timer->timer_after_func(timer->param);
} }
switch (timer->timer_type) { if (base_->running_timer) {
case 1: switch (timer->timer_type) {
case 2: //循环类定时 fixed timer也是循环定时器 case 1:
{ case 2: //循环类定时 fixed timer也是循环定时器
if (timer->timer_type == 2) { {
timer->fixed_timer_execute_times++; if (timer->timer_type == 2) {
timer->fixed_timer_execute_times++;
}
ModifyTimer(timer, timer->milli_seconds);
} }
ModifyTimer(timer, timer->milli_seconds); break;
} default: //deadline timer
break; {
default: //deadline timer DetachTimer(timer);
{ if (!list_empty(&timer->attach_entry)) {
DetachTimer(timer); list_del_init(&timer->attach_entry);
if (!list_empty(&timer->attach_entry)) { }
list_del_init(&timer->attach_entry); AddToFreeList(timer);
} }
AddToFreeList(timer); break;
} }
break;
} }
} }
} }