Process and Process Scheduler Tweaks

code/controllers/ProcessScheduler/core/process.dm

@@ -85,7 +85,13 @@
 
 	var/tmp/last_object
 
-datum/controller/process/New(var/datum/controller/processScheduler/scheduler)
+	// Counts the number of times an exception has occurred; gets reset after 10
+	var/tmp/list/exceptions = list()
+
+	// Number of deciseconds to delay before starting the process
+	var/start_delay = 0
+
+/datum/controller/process/New(var/datum/controller/processScheduler/scheduler)
 	..()
 	main = scheduler
 	previousStatus = "idle"
@@ -99,7 +105,7 @@ datum/controller/process/New(var/datum/controller/processScheduler/scheduler)
 	last_task = 0
 	last_object = null
 
-datum/controller/process/proc/started()
+/datum/controller/process/proc/started()
 	// Initialize last_slept so we can know when to sleep
 	last_slept = world.timeofday
 
@@ -114,48 +120,48 @@ datum/controller/process/proc/started()
 
 	onStart()
 
-datum/controller/process/proc/finished()
+/datum/controller/process/proc/finished()
 	ticks++
 	idle()
 	main.processFinished(src)
 
 	onFinish()
 
-datum/controller/process/proc/doWork()
+/datum/controller/process/proc/doWork()
 
-datum/controller/process/proc/setup()
+/datum/controller/process/proc/setup()
 
-datum/controller/process/proc/process()
+/datum/controller/process/proc/process()
 	started()
 	doWork()
 	finished()
 
-datum/controller/process/proc/running()
+/datum/controller/process/proc/running()
 	idle = 0
 	queued = 0
 	running = 1
 	hung = 0
 	setStatus(PROCESS_STATUS_RUNNING)
 
-datum/controller/process/proc/idle()
+/datum/controller/process/proc/idle()
 	queued = 0
 	running = 0
 	idle = 1
 	hung = 0
 	setStatus(PROCESS_STATUS_IDLE)
 
-datum/controller/process/proc/queued()
+/datum/controller/process/proc/queued()
 	idle = 0
 	running = 0
 	queued = 1
 	hung = 0
 	setStatus(PROCESS_STATUS_QUEUED)
 
-datum/controller/process/proc/hung()
+/datum/controller/process/proc/hung()
 	hung = 1
 	setStatus(PROCESS_STATUS_HUNG)
 
-datum/controller/process/proc/handleHung()
+/datum/controller/process/proc/handleHung()
 	var/datum/lastObj = last_object
 	var/lastObjType = "null"
 	if(istype(lastObj))
@@ -172,7 +178,7 @@ datum/controller/process/proc/handleHung()
 
 	main.restartProcess(src.name)
 
-datum/controller/process/proc/kill()
+/datum/controller/process/proc/kill()
 	if (!killed)
 		var/msg = "[name] process was killed at tick #[ticks]."
 		logTheThing("debug", null, null, msg)
@@ -187,7 +193,7 @@ datum/controller/process/proc/kill()
 		// This should del
 		del(src)
 
-datum/controller/process/proc/scheck(var/tickId = 0)
+/datum/controller/process/proc/scheck(var/tickId = 0)
 	if (killed)
 		// The kill proc is the only place where killed is set.
 		// The kill proc should have deleted this datum, and all sleeping procs that are
@@ -196,8 +202,8 @@ datum/controller/process/proc/scheck(var/tickId = 0)
 
 	// For each tick the process defers, it increments the cpu_defer_count so we don't
 	// defer indefinitely
-	if (world.cpu >= cpu_threshold + cpu_defer_count * 10)
-		sleep(1)
+	if (world.cpu >= (cpu_threshold + cpu_defer_count * world.tick_lag * 10))
+		sleep(world.tick_lag)
 		cpu_defer_count++
 		last_slept = world.timeofday
 	else
@@ -210,7 +216,7 @@ datum/controller/process/proc/scheck(var/tickId = 0)
 			sleep(0)
 			last_slept = world.timeofday
 
-datum/controller/process/proc/update()
+/datum/controller/process/proc/update()
 	// Clear delta
 	if(previousStatus != status)
 		setStatus(status)
@@ -224,18 +230,18 @@ datum/controller/process/proc/update()
 	else if (elapsedTime > hang_warning_time)
 		setStatus(PROCESS_STATUS_MAYBE_HUNG)
 
-datum/controller/process/proc/getElapsedTime()
+/datum/controller/process/proc/getElapsedTime()
 	if (world.timeofday < run_start)
 		return world.timeofday - (run_start - 864000)
 	return world.timeofday - run_start
 
-datum/controller/process/proc/tickDetail()
+/datum/controller/process/proc/tickDetail()
 	return
 
-datum/controller/process/proc/getContext()
+/datum/controller/process/proc/getContext()
 	return "<tr><td>[name]</td><td>[main.averageRunTime(src)]</td><td>[main.last_run_time[src]]</td><td>[main.highest_run_time[src]]</td><td>[ticks]</td></tr>\n"
 
-datum/controller/process/proc/getContextData()
+/datum/controller/process/proc/getContextData()
 	return list(
 	"name" = name,
 	"averageRunTime" = main.averageRunTime(src),
@@ -247,10 +253,10 @@ datum/controller/process/proc/getContextData()
 	"disabled" = disabled
 	)
 
-datum/controller/process/proc/getStatus()
+/datum/controller/process/proc/getStatus()
 	return status
 
-datum/controller/process/proc/getStatusText(var/s = 0)
+/datum/controller/process/proc/getStatusText(var/s = 0)
 	if(!s)
 		s = status
 	switch(s)
@@ -269,21 +275,21 @@ datum/controller/process/proc/getStatusText(var/s = 0)
 		else
 			return "UNKNOWN"
 
-datum/controller/process/proc/getPreviousStatus()
+/datum/controller/process/proc/getPreviousStatus()
 	return previousStatus
 
-datum/controller/process/proc/getPreviousStatusText()
+/datum/controller/process/proc/getPreviousStatusText()
 	return getStatusText(previousStatus)
 
-datum/controller/process/proc/setStatus(var/newStatus)
+/datum/controller/process/proc/setStatus(var/newStatus)
 	previousStatus = status
 	status = newStatus
 
-datum/controller/process/proc/setLastTask(var/task, var/object)
+/datum/controller/process/proc/setLastTask(var/task, var/object)
 	last_task = task
 	last_object = object
 
-datum/controller/process/proc/_copyStateFrom(var/datum/controller/process/target)
+/datum/controller/process/proc/_copyStateFrom(var/datum/controller/process/target)
 	main = target.main
 	name = target.name
 	schedule_interval = target.schedule_interval
@@ -296,22 +302,52 @@ datum/controller/process/proc/_copyStateFrom(var/datum/controller/process/target
 	last_object = target.last_object
 	copyStateFrom(target)
 
-datum/controller/process/proc/copyStateFrom(var/datum/controller/process/target)
+/datum/controller/process/proc/copyStateFrom(var/datum/controller/process/target)
 
-datum/controller/process/proc/onKill()
+/datum/controller/process/proc/onKill()
 
-datum/controller/process/proc/onStart()
+/datum/controller/process/proc/onStart()
 
-datum/controller/process/proc/onFinish()
+/datum/controller/process/proc/onFinish()
 
-datum/controller/process/proc/disable()
+/datum/controller/process/proc/disable()
 	disabled = 1
 
-datum/controller/process/proc/enable()
+/datum/controller/process/proc/enable()
 	disabled = 0
 
 /datum/controller/process/proc/getLastRunTime()
 	return main.getProcessLastRunTime(src)
 
+/datum/controller/process/proc/getHighestRunTime()
+	return main.getProcessHighestRunTime(src)
+
 /datum/controller/process/proc/getTicks()
 	return ticks
+
+/datum/controller/process/proc/statProcess()
+	stat("[name]", "T#[getTicks()]|LR [getLastRunTime()]|HR [getHighestRunTime()]|D [cpu_defer_count]")
+
+/datum/controller/process/proc/catchException(var/exception/e, var/thrower)
+	var/etext = "[e]"
+	var/eid = "[e]" // Exception ID, for tracking repeated exceptions
+	var/ptext = "" // "processing..." text, for what was being processed (if known)
+	if(istype(e))
+		etext += " in [e.file], line [e.line]"
+		eid = "[e.file]:[e.line]"
+	if(eid in exceptions)
+		if(exceptions[eid]++ >= 10)
+			return
+	else
+		exceptions[eid] = 1
+	if(istype(thrower, /datum))
+		var/datum/D = thrower
+		ptext = " processing [D.type]"
+		if(istype(thrower, /atom))
+			var/atom/A = thrower
+			ptext += " ([A]) ([A.x],[A.y],[A.z])"
+	world.log << "\[[time_stamp()]\] Process [name] caught exception[ptext]: [etext]"
+	if(exceptions[eid] >= 10)
+		world.log << "This exception will now be ignored for ten minutes."
+		spawn(6000)
+			exceptions[eid] = 0

code/controllers/ProcessScheduler/core/processScheduler.dm

@@ -66,6 +66,7 @@ var/global/datum/controller/processScheduler/processScheduler
 
 /datum/controller/processScheduler/proc/start()
 	isRunning = 1
+	updateStartDelays()
 	spawn(0)
 		process()
 
@@ -108,12 +109,8 @@ var/global/datum/controller/processScheduler/processScheduler
 		if (p.disabled || p.running || p.queued || !p.idle)
 			continue
 
-		// If world.timeofday has rolled over, then we need to adjust.
-		if (world.timeofday < last_start[p])
-			last_start[p] -= 864000
-
 		// If the process should be running by now, go ahead and queue it
-		if (world.timeofday > last_start[p] + p.schedule_interval)
+		if (world.time >= last_start[p] + p.schedule_interval)
 			setQueuedProcessState(p)
 
 /datum/controller/processScheduler/proc/runQueuedProcesses()
@@ -176,6 +173,10 @@ var/global/datum/controller/processScheduler/processScheduler
 
 	nameToProcessMap[newProcess.name] = newProcess
 
+/datum/controller/processScheduler/proc/updateStartDelays()
+	for(var/datum/controller/process/p in processes)
+		if(p.start_delay)
+			last_start[p] = world.time - p.start_delay
 
 /datum/controller/processScheduler/proc/runProcess(var/datum/controller/process/process)
 	spawn(0)
@@ -222,17 +223,13 @@ var/global/datum/controller/processScheduler/processScheduler
 
 /datum/controller/processScheduler/proc/recordStart(var/datum/controller/process/process, var/time = null)
 	if (isnull(time))
-		time = world.timeofday
+		time = world.time
 
 	last_start[process] = time
 
 /datum/controller/processScheduler/proc/recordEnd(var/datum/controller/process/process, var/time = null)
 	if (isnull(time))
-		time = world.timeofday
-
-	// If world.timeofday has rolled over, then we need to adjust.
-	if (time < last_start[process])
-		last_start[process] -= 864000
+		time = world.time
 
 	var/lastRunTime = time - last_start[process]
 
@@ -316,5 +313,16 @@ var/global/datum/controller/processScheduler/processScheduler
 /datum/controller/processScheduler/proc/getProcessLastRunTime(var/datum/controller/process/process)
 	return last_run_time[process]
 
+/datum/controller/processScheduler/proc/getProcessHighestRunTime(var/datum/controller/process/process)
+	return highest_run_time[process]
+
 /datum/controller/processScheduler/proc/getIsRunning()
 	return isRunning
+
+/datum/controller/processScheduler/proc/statProcesses()
+	if(!isRunning)
+		stat("Processes", "Scheduler not running")
+		return
+	stat("Processes", "[processes.len] (R[running.len]/Q[queued.len]/I[idle.len])")
+	for(var/datum/controller/process/p in processes)
+		p.statProcess()