Conflict resolution

This commit is contained in:
Krausus
2016-08-17 22:54:22 -04:00
233 changed files with 4535 additions and 42032 deletions
@@ -361,7 +361,9 @@
var/lastRunTime = round(last_run_time, 0.001)
var/highestRunTime = round(highest_run_time, 0.001)
var/deferTime = round(cpu_defer_count / 10 * world.tick_lag, 0.01)
stat("[name]", "T#[getTicks()] | AR [averageRunTime] | LR [lastRunTime] | HR [highestRunTime] | D [deferTime]")
if(!statclick)
statclick = new (src)
stat("[name]", statclick.update("T#[getTicks()] | AR [averageRunTime] | LR [lastRunTime] | HR [highestRunTime] | D [deferTime]"))
/datum/controller/process/proc/catchException(var/exception/e, var/thrower)
if(istype(e)) // Real runtimes go to the real error handler
@@ -393,4 +395,4 @@
/datum/controller/process/proc/catchBadType(var/datum/caught)
if(isnull(caught) || !istype(caught) || !isnull(caught.gcDestroyed))
return // Only bother with types we can identify and that don't belong
catchException("Type [caught.type] does not belong in process' queue")
catchException("Type [caught.type] does not belong in process' queue")
@@ -228,6 +228,8 @@ var/global/datum/controller/processScheduler/processScheduler
if(!isRunning)
stat("Processes", "Scheduler not running")
return
stat("Processes", "[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])")
if(!statclick)
statclick = new (src)
stat("Processes", statclick.update("[processes.len] (R [running.len] / Q [queued.len] / I [idle.len])"))
for(var/datum/controller/process/p in processes)
p.statProcess()
-4
View File
@@ -86,7 +86,6 @@
var/donationsurl = "http://example.org"
var/repositoryurl = "http://example.org"
var/media_base_url = "http://example.org"
var/overflow_server_url
var/forbid_singulo_possession = 0
@@ -484,9 +483,6 @@
if("assistant_ratio")
config.assistantratio = text2num(value)
if("media_base_url")
media_base_url = value
if("allow_drone_spawn")
config.allow_drone_spawn = text2num(value)
+3
View File
@@ -15,6 +15,9 @@ var/global/pipe_processing_killed = 0
var/iteration = 0
var/processing_interval = 0
// Dummy object to let us click it to debug while in the stat panel
var/obj/effect/statclick/debug/statclick
/datum/controller/proc/recover() // If we are replacing an existing controller (due to a crash) we attempt to preserve as much as we can.
/datum/controller/game_controller