server_common/a8
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复timer泄漏问题

Browse Source
This commit is contained in:
aozhiwei 2019-02-11 15:49:24 +08:00
parent bc1e1e002c
commit 8b113606e3
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
a8/timer.cc
View File

@ -148,6 +148,9 @@ namespace a8
void Timer::UnInit() void Timer::UnInit()
{ {
Clear();
delete base_;
base_ = nullptr;
} }
void Timer::Update() void Timer::Update()
@ -332,6 +335,32 @@ namespace a8
base_->free_timer_num++; base_->free_timer_num++;
} }
void Timer::Clear()
{
auto free_timers =
[] (list_head* head)
{
while (!list_empty(head)) {
struct timer_list *timer;
timer = list_first_entry(head, struct timer_list,entry);
DetachTimer(timer);
if (!list_empty(&timer->attach_entry)) {
list_del_init(&timer->attach_entry);
}
delete timer;
}
};
for (int j = 0; j < TVN_SIZE; j++) {
free_timers(base_->tv5.vec + j);
free_timers(base_->tv4.vec + j);
free_timers(base_->tv3.vec + j);
free_timers(base_->tv2.vec + j);
}
for (int j = 0; j < TVR_SIZE; j++) {
free_timers(base_->tv1.vec + j);
}
}
void Timer::GC_TimerFunc(const a8::XParams& param) void Timer::GC_TimerFunc(const a8::XParams& param)
{ {
Timer* timer = (Timer*)param.sender.GetUserData(); Timer* timer = (Timer*)param.sender.GetUserData();

1
a8/timer.h
View File

@ -47,6 +47,7 @@ namespace a8
void UpdateTimer(); void UpdateTimer();
timer_list* NewTimerList(); timer_list* NewTimerList();
void AddToFreeList(timer_list* timer); void AddToFreeList(timer_list* timer);
void Clear();
static void GC_TimerFunc(const a8::XParams& param); static void GC_TimerFunc(const a8::XParams& param);
private: private: