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

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-04 12:36:40 +08:00
parent e934b0c6ca
commit a9b6ae14e7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
listhead.go
View File

@ -48,4 +48,6 @@ func (this *ListHead) Empty() bool {
} }
func (this *ListHead) DelInit() { func (this *ListHead) DelInit() {
this.Del()
this.Init()
} }

13
timer.go
View File

@ -92,10 +92,10 @@ func (this *Timer) Update() {
index := uint32(this.timerTick & TVR_MASK) index := uint32(this.timerTick & TVR_MASK)
if index != 0 && if index != 0 &&
this.cascade(&this.tv2, this.getTimerIndex(index)) != 0 && this.cascade(&this.tv2, this.getTimerIndex(0)) != 0 &&
this.cascade(&this.tv3, this.getTimerIndex(index)) != 0 && this.cascade(&this.tv3, this.getTimerIndex(1)) != 0 &&
this.cascade(&this.tv4, this.getTimerIndex(index)) != 0 { this.cascade(&this.tv4, this.getTimerIndex(2)) != 0 {
this.cascade(&this.tv5, this.getTimerIndex(index)) this.cascade(&this.tv5, this.getTimerIndex(3))
} }
this.timerTick += 1 this.timerTick += 1
@ -270,6 +270,7 @@ func (this *Timer) cascade(tv *[TVN_SIZE]ListHead, index uint32) uint32 {
} }
func (this *Timer) internalAddTimer(timer_list *TimerList) { func (this *Timer) internalAddTimer(timer_list *TimerList) {
timer_list.entry.data = timer_list
expires := timer_list.expires expires := timer_list.expires
idx := expires - this.timerTick idx := expires - this.timerTick
var vec *ListHead var vec *ListHead
@ -308,7 +309,9 @@ func (this *Timer) newTimerList() *TimerList {
this.freeTimerNum -= 1 this.freeTimerNum -= 1
return timerList return timerList
} else { } else {
return new(TimerList) timerList := new(TimerList)
timerList.entry.Init()
return timerList
} }
} }