cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23269 from MrStonedOne/patch-293

Browse Source 
Makes the timer subsystem less chinsky at the cost of performance
This commit is contained in:
Joan Lung
2017-01-26 20:21:05 -05:00
committed by GitHub
parent 32b8791213 aad8724558
commit 87682f683a
1 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/timer.dm
+41 -40
View File
@@ -39,70 +39,71 @@ var/datum/subsystem/timer/SStimer
/datum/subsystem/timer/stat_entry(msg)
..("B:[bucket_count] P:[length(processing)] H:[length(hashes)] C:[length(clienttime_timers)]")
/datum/subsystem/timer/fire()
/datum/subsystem/timer/fire(resumed = FALSE)
if (length(clienttime_timers))
for (var/thing in clienttime_timers)
var/datum/timedevent/timer = thing
if (timer.spent)
qdel(timer)
var/datum/timedevent/ctime_timer = thing
if (ctime_timer.spent)
qdel(ctime_timer)
continue
if (timer.timeToRun <= REALTIMEOFDAY)
var/datum/callback/callBack = timer.callBack
timer.spent = TRUE
if (ctime_timer.timeToRun <= REALTIMEOFDAY)
var/datum/callback/callBack = ctime_timer.callBack
ctime_timer.spent = TRUE
callBack.InvokeAsync()
qdel(timer)
qdel(ctime_timer)
if (MC_TICK_CHECK)
return
if (head_offset + (world.tick_lag * BUCKET_LEN) < world.time || length(src.bucket_list) != BUCKET_LEN || world.tick_lag != bucket_resolution)
var/static/list/spent = list()
var/static/datum/timedevent/timer
var/static/datum/timedevent/head
if ((practical_offset > BUCKET_LEN * 0.75 && (head_offset + (world.tick_lag * BUCKET_LEN) < world.time)) || length(src.bucket_list) != BUCKET_LEN || world.tick_lag != bucket_resolution)
shift_buckets()
resumed = FALSE
if (!resumed)
timer = null
head = null
var/list/bucket_list = src.bucket_list
var/static/list/spent = list()
LOOP_OUTER
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]
while (practical_offset <= BUCKET_LEN && head_offset + (practical_offset*world.tick_lag) <= world.time && !MC_TICK_CHECK)
if (!timer || !head || timer == head)
head = bucket_list[practical_offset]
if (!head)
practical_offset++
if (MC_TICK_CHECK)
break
continue
var/datum/timedevent/timer = head
do
var/datum/callback/callBack = timer.callBack
if (!callBack || timer.spent)
qdel(timer)
bucket_resolution = null //force bucket recreation
CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||qdeleted(timer)=[qdeleted(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
timer = head
do
var/datum/callback/callBack = timer.callBack
if (!callBack)
qdel(timer)
bucket_resolution = null //force bucket recreation
CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||qdeleted(timer)=[qdeleted(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
if (!timer.spent)
spent += timer
timer.spent = TRUE
callBack.InvokeAsync()
timer = timer.next
timer = timer.next
if (MC_TICK_CHECK)
if (!timer || timer == head)
break
if (head.prev)
head.prev.next = timer
if (timer.prev)
timer.prev.next = head
timer.prev = head.prev
bucket_list[practical_offset] = timer
break LOOP_OUTER
while (timer && timer != head)
bucket_list[practical_offset++] = null
if (MC_TICK_CHECK)
break
return
while (timer && timer != head)
timer = null
bucket_list[practical_offset++] = null
if (MC_TICK_CHECK)
return
bucket_count -= length(spent)
for (var/timer in spent)
qdel(timer)
for (var/spent_timer in spent)
qdel(spent_timer)
spent.len = 0
@@ -251,7 +252,7 @@ var/datum/subsystem/timer/SStimer
if (flags & TIMER_CLIENT_TIME)
SStimer.clienttime_timers -= src
return QDEL_HINT_IWILLGC
return QDEL_HINT_QUEUE
if (flags & TIMER_STOPPABLE)
SStimer.timer_id_dict -= "timerid[id]"
@@ -286,7 +287,7 @@ var/datum/subsystem/timer/SStimer
next.prev = null
next = null
prev = null
return QDEL_HINT_IWILLGC
return QDEL_HINT_QUEUE
proc/addtimer(datum/callback/callback, wait, flags)
if (!callback)