shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."

Browse Source
This commit is contained in:
kevinz000
2017-12-08 19:16:49 -08:00
committed by GitHub
parent 99283df12b
commit 75eab09dff
2 changed files with 103 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/time.dm
+2 -2
View File
@@ -22,6 +22,6 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using
#define TICKS *world.tick_lag #define TICKS *world.tick_lag
#define DS2TICKS(DS) ((DS)/world.tick_lag) #define DS2TICKS(DS) (DS/world.tick_lag)
#define TICKS2DS(T) ((T) TICKS) #define TICKS2DS(T) (T TICKS)
code/controllers/subsystem/timer.dm
+101 -200
View File
@@ -1,6 +1,5 @@
#define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth) #define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth)
#define BUCKET_POS(timer) ((round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) % BUCKET_LEN) + 1) #define BUCKET_POS(timer) (round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) + 1)
#define TIMER_MAX (world.time + TICKS2DS(min(BUCKET_LEN-(SStimer.practical_offset-DS2TICKS(world.time - SStimer.head_offset))-1, BUCKET_LEN-1)))
#define TIMER_ID_MAX (2**24) //max float with integer precision #define TIMER_ID_MAX (2**24) //max float with integer precision
SUBSYSTEM_DEF(timer) SUBSYSTEM_DEF(timer)
@@ -10,11 +9,11 @@ SUBSYSTEM_DEF(timer)
flags = SS_TICKER|SS_NO_INIT flags = SS_TICKER|SS_NO_INIT
var/list/datum/timedevent/second_queue = list() //awe, yes, you've had first queue, but what about second queue? var/list/datum/timedevent/processing = list()
var/list/hashes = list() var/list/hashes = list()
var/head_offset = 0 //world.time of the first entry in the the bucket. var/head_offset = 0 //world.time of the first entry in the the bucket.
var/practical_offset = 1 //index of the first non-empty item in the bucket. var/practical_offset = 0 //index of the first non-empty item in the bucket.
var/bucket_resolution = 0 //world.tick_lag the bucket was designed for var/bucket_resolution = 0 //world.tick_lag the bucket was designed for
var/bucket_count = 0 //how many timers are in the buckets var/bucket_count = 0 //how many timers are in the buckets
@@ -28,19 +27,13 @@ SUBSYSTEM_DEF(timer)
var/static/last_invoke_warning = 0 var/static/last_invoke_warning = 0
var/static/bucket_auto_reset = TRUE var/static/bucket_auto_reset = TRUE
/datum/controller/subsystem/timer/PreInit()
bucket_list.len = BUCKET_LEN
head_offset = world.time
bucket_resolution = world.tick_lag
/datum/controller/subsystem/timer/stat_entry(msg) /datum/controller/subsystem/timer/stat_entry(msg)
..("B:[bucket_count] P:[length(second_queue)] H:[length(hashes)] C:[length(clienttime_timers)] S:[length(timer_id_dict)]") ..("B:[bucket_count] P:[length(processing)] H:[length(hashes)] C:[length(clienttime_timers)]")
/datum/controller/subsystem/timer/fire(resumed = FALSE) /datum/controller/subsystem/timer/fire(resumed = FALSE)
var/lit = last_invoke_tick var/lit = last_invoke_tick
var/last_check = world.time - TIMER_NO_INVOKE_WARNING var/last_check = world.time - TIMER_NO_INVOKE_WARNING
var/list/bucket_list = src.bucket_list var/list/bucket_list = src.bucket_list
if(!bucket_count) if(!bucket_count)
last_invoke_tick = world.time last_invoke_tick = world.time
@@ -67,62 +60,50 @@ SUBSYSTEM_DEF(timer)
bucket_node = bucket_node.next bucket_node = bucket_node.next
anti_loop_check-- anti_loop_check--
while(bucket_node && bucket_node != bucket_head && anti_loop_check) while(bucket_node && bucket_node != bucket_head && anti_loop_check)
log_world("Active timers in the second_queue queue:") log_world("Active timers in the processing queue:")
for(var/I in second_queue) for(var/I in processing)
log_world(get_timer_debug_string(I)) log_world(get_timer_debug_string(I))
var/next_clienttime_timer_index = 0 while(length(clienttime_timers))
var/len = length(clienttime_timers) var/datum/timedevent/ctime_timer = clienttime_timers[clienttime_timers.len]
if (ctime_timer.timeToRun <= REALTIMEOFDAY)
for (next_clienttime_timer_index in 1 to len) --clienttime_timers.len
var/datum/callback/callBack = ctime_timer.callBack
ctime_timer.spent = REALTIMEOFDAY
callBack.InvokeAsync()
qdel(ctime_timer)
else
break //None of the rest are ready to run
if (MC_TICK_CHECK) if (MC_TICK_CHECK)
next_clienttime_timer_index-- return
break
var/datum/timedevent/ctime_timer = clienttime_timers[next_clienttime_timer_index]
if (ctime_timer.timeToRun > REALTIMEOFDAY)
next_clienttime_timer_index--
break
var/datum/callback/callBack = ctime_timer.callBack
if (!callBack)
clienttime_timers.Cut(next_clienttime_timer_index,next_clienttime_timer_index+1)
CRASH("Invalid timer: [get_timer_debug_string(ctime_timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset], REALTIMEOFDAY: [REALTIMEOFDAY]")
ctime_timer.spent = REALTIMEOFDAY
callBack.InvokeAsync()
qdel(ctime_timer)
if (next_clienttime_timer_index)
clienttime_timers.Cut(1,next_clienttime_timer_index+1)
if (MC_TICK_CHECK)
return
var/static/list/spent = list() var/static/list/spent = list()
var/static/datum/timedevent/timer var/static/datum/timedevent/timer
if (practical_offset > BUCKET_LEN) var/static/datum/timedevent/head
head_offset += TICKS2DS(BUCKET_LEN)
practical_offset = 1
resumed = FALSE
if ((length(bucket_list) != BUCKET_LEN) || (world.tick_lag != bucket_resolution)) if (practical_offset > BUCKET_LEN || (!resumed && length(bucket_list) != BUCKET_LEN || world.tick_lag != bucket_resolution))
reset_buckets() shift_buckets()
bucket_list = src.bucket_list bucket_list = src.bucket_list
resumed = FALSE resumed = FALSE
if (!resumed) if (!resumed)
timer = null timer = null
head = null
while (practical_offset <= BUCKET_LEN && head_offset + (practical_offset*world.tick_lag) <= world.time) while (practical_offset <= BUCKET_LEN && head_offset + (practical_offset*world.tick_lag) <= world.time && !MC_TICK_CHECK)
var/datum/timedevent/head = bucket_list[practical_offset]
if (!timer || !head || timer == head) if (!timer || !head || timer == head)
head = bucket_list[practical_offset] head = bucket_list[practical_offset]
if (!head)
practical_offset++
if (MC_TICK_CHECK)
break
continue
timer = head timer = head
while (timer) do
var/datum/callback/callBack = timer.callBack var/datum/callback/callBack = timer.callBack
if (!callBack) if (!callBack)
qdel(timer)
bucket_resolution = null //force bucket recreation bucket_resolution = null //force bucket recreation
CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]") CRASH("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
@@ -132,68 +113,15 @@ SUBSYSTEM_DEF(timer)
callBack.InvokeAsync() callBack.InvokeAsync()
last_invoke_tick = world.time last_invoke_tick = world.time
timer = timer.next
if (MC_TICK_CHECK) if (MC_TICK_CHECK)
return return
while (timer && timer != head)
timer = timer.next
if (timer == head)
break
bucket_list[practical_offset++] = null
//we freed up a bucket, lets see if anything in second_queue needs to be shifted to that bucket.
var/i = 0
var/L = length(second_queue)
for (i in 1 to L)
timer = second_queue[i]
if (timer.timeToRun >= TIMER_MAX)
i--
break
if (timer.timeToRun < head_offset)
bucket_resolution = null //force bucket recreation
CRASH("[i] Invalid timer state: Timer in long run queue with a time to run less then head_offset. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
if (timer.callBack && !timer.spent)
timer.callBack.InvokeAsync()
spent += timer
bucket_count++
else if(!QDELETED(timer))
qdel(timer)
continue
if (timer.timeToRun < head_offset + TICKS2DS(practical_offset))
bucket_resolution = null //force bucket recreation
CRASH("[i] Invalid timer state: Timer in long run queue that would require a backtrack to transfer to short run queue. [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
if (timer.callBack && !timer.spent)
timer.callBack.InvokeAsync()
spent += timer
bucket_count++
else if(!QDELETED(timer))
qdel(timer)
continue
bucket_count++
var/bucket_pos = max(1, BUCKET_POS(timer))
var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
if (!bucket_head)
bucket_list[bucket_pos] = timer
timer.next = null
timer.prev = null
continue
if (!bucket_head.prev)
bucket_head.prev = bucket_head
timer.next = bucket_head
timer.prev = bucket_head.prev
timer.next.prev = timer
timer.prev.next = timer
if (i)
second_queue.Cut(1, i+1)
timer = null timer = null
bucket_list[practical_offset++] = null
if (MC_TICK_CHECK)
return
bucket_count -= length(spent) bucket_count -= length(spent)
@@ -213,7 +141,7 @@ SUBSYSTEM_DEF(timer)
if(!TE.callBack) if(!TE.callBack)
. += ", NO CALLBACK" . += ", NO CALLBACK"
/datum/controller/subsystem/timer/proc/reset_buckets() /datum/controller/subsystem/timer/proc/shift_buckets()
var/list/bucket_list = src.bucket_list var/list/bucket_list = src.bucket_list
var/list/alltimers = list() var/list/alltimers = list()
//collect the timers currently in the bucket //collect the timers currently in the bucket
@@ -234,7 +162,7 @@ SUBSYSTEM_DEF(timer)
head_offset = world.time head_offset = world.time
bucket_resolution = world.tick_lag bucket_resolution = world.tick_lag
alltimers += second_queue alltimers += processing
if (!length(alltimers)) if (!length(alltimers))
return return
@@ -245,26 +173,22 @@ SUBSYSTEM_DEF(timer)
if (head.timeToRun < head_offset) if (head.timeToRun < head_offset)
head_offset = head.timeToRun head_offset = head.timeToRun
var/new_bucket_count var/list/timers_to_remove = list()
var/i = 1
for (i in 1 to length(alltimers)) for (var/thing in alltimers)
var/datum/timedevent/timer = alltimers[1] var/datum/timedevent/timer = thing
if (!timer) if (!timer)
timers_to_remove += timer
continue continue
var/bucket_pos = BUCKET_POS(timer) var/bucket_pos = BUCKET_POS(timer)
if (timer.timeToRun >= TIMER_MAX) if (bucket_pos > BUCKET_LEN)
i--
break break
timers_to_remove += timer //remove it from the big list once we are done
if (!timer.callBack || timer.spent) if (!timer.callBack || timer.spent)
WARNING("Invalid timer: [get_timer_debug_string(timer)] world.time: [world.time], head_offset: [head_offset], practical_offset: [practical_offset]")
if (timer.callBack)
qdel(timer)
continue continue
bucket_count++
new_bucket_count++
var/datum/timedevent/bucket_head = bucket_list[bucket_pos] var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
if (!bucket_head) if (!bucket_head)
bucket_list[bucket_pos] = timer bucket_list[bucket_pos] = timer
@@ -278,14 +202,12 @@ SUBSYSTEM_DEF(timer)
timer.prev = bucket_head.prev timer.prev = bucket_head.prev
timer.next.prev = timer timer.next.prev = timer
timer.prev.next = timer timer.prev.next = timer
if (i)
alltimers.Cut(1, i+1) processing = (alltimers - timers_to_remove)
second_queue = alltimers
bucket_count = new_bucket_count
/datum/controller/subsystem/timer/Recover() /datum/controller/subsystem/timer/Recover()
second_queue |= SStimer.second_queue processing |= SStimer.processing
hashes |= SStimer.hashes hashes |= SStimer.hashes
timer_id_dict |= SStimer.timer_id_dict timer_id_dict |= SStimer.timer_id_dict
bucket_list |= SStimer.bucket_list bucket_list |= SStimer.bucket_list
@@ -302,6 +224,8 @@ SUBSYSTEM_DEF(timer)
var/datum/timedevent/next var/datum/timedevent/next
var/datum/timedevent/prev var/datum/timedevent/prev
var/static/nextid = 1
/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash) /datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash)
id = TIMER_ID_NULL id = TIMER_ID_NULL
src.callBack = callBack src.callBack = callBack
@@ -311,65 +235,56 @@ SUBSYSTEM_DEF(timer)
if (flags & TIMER_UNIQUE) if (flags & TIMER_UNIQUE)
SStimer.hashes[hash] = src SStimer.hashes[hash] = src
if (flags & TIMER_STOPPABLE) if (flags & TIMER_STOPPABLE)
id = GUID() do
SStimer.timer_id_dict[id] = src if (nextid >= TIMER_ID_MAX)
nextid = 1
id = nextid++
while(SStimer.timer_id_dict["timerid" + num2text(id, 8)])
SStimer.timer_id_dict["timerid" + num2text(id, 8)] = src
name = "Timer: [id] (\ref[src]), TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])" name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: [REF(callBack)], callBack.object: [callBack.object][REF(callBack.object)]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
if ((timeToRun < world.time || timeToRun < SStimer.head_offset) && !(flags & TIMER_CLIENT_TIME)) if (spent)
CRASH("Invalid timer state: Timer created that would require a backtrack to run (addtimer would never let this happen): [SStimer.get_timer_debug_string(src)]") CRASH("HOLY JESUS. WHAT IS THAT? WHAT THE FUCK IS THAT?")
if (callBack.object != GLOBAL_PROC) if (callBack.object != GLOBAL_PROC)
LAZYADD(callBack.object.active_timers, src) LAZYADD(callBack.object.active_timers, src)
var/list/L
if (flags & TIMER_CLIENT_TIME) if (flags & TIMER_CLIENT_TIME)
L = SStimer.clienttime_timers //sorted insert
else if (timeToRun >= TIMER_MAX) var/list/ctts = SStimer.clienttime_timers
L = SStimer.second_queue var/cttl = length(ctts)
if (L)
//binary search sorted insert
var/cttl = length(L)
if(cttl) if(cttl)
var/left = 1 var/datum/timedevent/Last = ctts[cttl]
var/right = cttl if(Last.timeToRun >= timeToRun)
var/mid = (left+right) >> 1 //rounded divide by two for hedgehogs ctts += src
else
var/datum/timedevent/item for(var/i in cttl to 1 step -1)
while (left < right) var/datum/timedevent/E = ctts[i]
item = L[mid] if(E.timeToRun <= timeToRun)
if (item.timeToRun <= timeToRun) ctts.Insert(i, src)
left = mid+1 break
else
right = mid
mid = (left+right) >> 1
item = L[mid]
mid = item.timeToRun > timeToRun ? mid : mid+1
L.Insert(mid, src)
else else
L += src ctts += src
return return
//get the list of buckets //get the list of buckets
var/list/bucket_list = SStimer.bucket_list var/list/bucket_list = SStimer.bucket_list
//calculate our place in the bucket list //calculate our place in the bucket list
var/bucket_pos = BUCKET_POS(src) var/bucket_pos = BUCKET_POS(src)
//we are too far aways from needing to run to be in the bucket list, shift_buckets() will handle us.
if (bucket_pos > length(bucket_list))
SStimer.processing += src
return
//get the bucket for our tick //get the bucket for our tick
var/datum/timedevent/bucket_head = bucket_list[bucket_pos] var/datum/timedevent/bucket_head = bucket_list[bucket_pos]
SStimer.bucket_count++ SStimer.bucket_count++
//empty bucket, we will just add ourselves //empty bucket, we will just add ourselves
if (!bucket_head) if (!bucket_head)
bucket_list[bucket_pos] = src bucket_list[bucket_pos] = src
if (bucket_pos < SStimer.practical_offset)
SStimer.practical_offset = bucket_pos
return return
//other wise, lets do a simplified linked list add. //other wise, lets do a simplified linked list add.
if (!bucket_head.prev) if (!bucket_head.prev)
@@ -381,9 +296,10 @@ SUBSYSTEM_DEF(timer)
/datum/timedevent/Destroy() /datum/timedevent/Destroy()
..() ..()
if (flags & TIMER_UNIQUE && hash) if (flags & TIMER_UNIQUE)
SStimer.hashes -= hash SStimer.hashes -= hash
if (callBack && callBack.object && callBack.object != GLOBAL_PROC && callBack.object.active_timers) if (callBack && callBack.object && callBack.object != GLOBAL_PROC && callBack.object.active_timers)
callBack.object.active_timers -= src callBack.object.active_timers -= src
UNSETEMPTY(callBack.object.active_timers) UNSETEMPTY(callBack.object.active_timers)
@@ -391,33 +307,13 @@ SUBSYSTEM_DEF(timer)
callBack = null callBack = null
if (flags & TIMER_STOPPABLE) if (flags & TIMER_STOPPABLE)
SStimer.timer_id_dict -= id SStimer.timer_id_dict -= "timerid" + num2text(id, 8)
if (flags & TIMER_CLIENT_TIME) if (flags & TIMER_CLIENT_TIME)
if (!spent) SStimer.clienttime_timers -= src
spent = world.time
SStimer.clienttime_timers -= src
return QDEL_HINT_IWILLGC return QDEL_HINT_IWILLGC
if (!spent) if (!spent)
spent = world.time
var/bucketpos = BUCKET_POS(src)
var/datum/timedevent/buckethead
var/list/bucket_list = SStimer.bucket_list
if (bucketpos > 0)
buckethead = bucket_list[bucketpos]
if (buckethead == src)
bucket_list[bucketpos] = next
SStimer.bucket_count--
else if (timeToRun < TIMER_MAX || next || prev)
SStimer.bucket_count--
else
var/l = length(SStimer.second_queue)
SStimer.second_queue -= src
if (l == length(SStimer.second_queue))
SStimer.bucket_count--
if (prev == next && next) if (prev == next && next)
next.prev = null next.prev = null
prev.next = null prev.next = null
@@ -426,6 +322,19 @@ SUBSYSTEM_DEF(timer)
prev.next = next prev.next = next
if (next) if (next)
next.prev = prev next.prev = prev
var/bucketpos = BUCKET_POS(src)
var/datum/timedevent/buckethead
var/list/bucket_list = SStimer.bucket_list
if (bucketpos > 0 && bucketpos <= length(bucket_list))
buckethead = bucket_list[bucketpos]
SStimer.bucket_count--
else
SStimer.processing -= src
if (buckethead == src)
bucket_list[bucketpos] = next
else else
if (prev && prev.next == src) if (prev && prev.next == src)
prev.next = next prev.next = next
@@ -442,16 +351,9 @@ SUBSYSTEM_DEF(timer)
else else
. = "[callBack.object.type]" . = "[callBack.object.type]"
/proc/addtimer(datum/callback/callback, wait = 0, flags = 0) /proc/addtimer(datum/callback/callback, wait, flags)
if (!callback) if (!callback)
CRASH("addtimer called without a callback") return
if (wait < 0)
stack_trace("Addtimer called with a negitive wait. Converting to 0")
//alot of things add short timers on themselves in their destroy, we ignore those cases
if (wait >= 1 && callback && callback.object && callback.object != GLOBAL_PROC && QDELETED(callback.object))
stack_trace("Add timer called with a callback assigned to a qdeleted object")
wait = max(wait, 0) wait = max(wait, 0)
@@ -472,10 +374,11 @@ SUBSYSTEM_DEF(timer)
var/datum/timedevent/hash_timer = SStimer.hashes[hash] var/datum/timedevent/hash_timer = SStimer.hashes[hash]
if(hash_timer) if(hash_timer)
if (hash_timer.spent) //it's pending deletion, pretend it doesn't exist. if (hash_timer.spent) //it's pending deletion, pretend it doesn't exist.
hash_timer.hash = null //but keep it from accidentally deleting us hash_timer.hash = null
SStimer.hashes -= hash
else else
if (flags & TIMER_OVERRIDE) if (flags & TIMER_OVERRIDE)
hash_timer.hash = null //no need having it delete it's hash if we are going to replace it
qdel(hash_timer) qdel(hash_timer)
else else
if (hash_timer.flags & TIMER_STOPPABLE) if (hash_timer.flags & TIMER_STOPPABLE)
@@ -500,7 +403,7 @@ SUBSYSTEM_DEF(timer)
qdel(id) qdel(id)
return TRUE return TRUE
//id is string //id is string
var/datum/timedevent/timer = SStimer.timer_id_dict[id] var/datum/timedevent/timer = SStimer.timer_id_dict["timerid[id]"]
if (timer && !timer.spent) if (timer && !timer.spent)
qdel(timer) qdel(timer)
return TRUE return TRUE
@@ -509,5 +412,3 @@ SUBSYSTEM_DEF(timer)
#undef BUCKET_LEN #undef BUCKET_LEN
#undef BUCKET_POS #undef BUCKET_POS
#undef TIMER_MAX
#undef TIMER_ID_MAX