Merge pull request #7050 from VOREStation/aro-procdebug

Add Recover() to processing subsystems

code/controllers/subsystems/bellies_vr.dm

@@ -12,9 +12,20 @@ SUBSYSTEM_DEF(bellies)
 	flags = SS_KEEP_TIMING|SS_NO_INIT
 	runlevels = RUNLEVEL_GAME|RUNLEVEL_POSTGAME
 
-	var/static/list/belly_list = list()
+	var/list/belly_list = list()
 	var/list/currentrun = list()
 	var/ignored_bellies = 0
+	var/obj/belly/current_belly
+
+/datum/controller/subsystem/bellies/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSbellies.current_belly)
+		log_debug("current_belly was: (\ref[SSbellies.current_belly])[SSbellies.current_belly]([SSbellies.current_belly.type])(SSbellies.current_belly.owner) - currentrun: [SSbellies.currentrun.len] vs total: [SSbellies.belly_list.len]")
+	var/list/old_bellies = SSbellies.belly_list.Copy()
+	for(var/datum/D in old_bellies)
+		if(!isbelly(D))
+			log_debug("[name] subsystem Recover() found inappropriate item in list: [D.type]")
+		belly_list |= D
 
 /datum/controller/subsystem/bellies/stat_entry()
 	..("#: [belly_list.len] | P: [ignored_bellies]")
@@ -28,14 +39,17 @@ SUBSYSTEM_DEF(bellies)
 	var/list/currentrun = src.currentrun
 	var/times_fired = src.times_fired
 	while(currentrun.len)
-		var/obj/belly/B = currentrun[currentrun.len]
+		current_belly = currentrun[currentrun.len]
 		currentrun.len--
 
-		if(QDELETED(B))
-			belly_list -= B
+		if(QDELETED(current_belly))
+			belly_list -= current_belly
 		else
-			if(B.process_belly(times_fired,wait) == SSBELLIES_IGNORED)
+			if(current_belly.process_belly(times_fired,wait) == SSBELLIES_IGNORED)
 				ignored_bellies++
 
 		if (MC_TICK_CHECK)
+			current_belly = null
 			return
+
+	current_belly = null

code/controllers/subsystems/processing/chemistry.dm

@@ -8,6 +8,14 @@ PROCESSING_SUBSYSTEM_DEF(chemistry)
 	var/list/chemical_reagents = list()
 
 /datum/controller/subsystem/processing/chemistry/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSchemistry.current_thing)
+		log_debug("current_thing was: (\ref[SSchemistry.current_thing])[SSchemistry.current_thing]([SSchemistry.current_thing.type]) - currentrun: [SSchemistry.currentrun.len] vs total: [SSchemistry.processing.len]")
+	var/list/old_processing = SSchemistry.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D
+
 	chemical_reactions = SSchemistry.chemical_reactions
 	chemical_reagents = SSchemistry.chemical_reagents
 

code/controllers/subsystems/processing/fastprocess.dm

@@ -4,3 +4,12 @@ PROCESSING_SUBSYSTEM_DEF(fastprocess)
 	name = "Fast Processing"
 	wait = 2
 	stat_tag = "FP"
+
+/datum/controller/subsystem/processing/fastprocess/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSfastprocess.current_thing)
+		log_debug("current_thing was: (\ref[SSfastprocess.current_thing])[SSfastprocess.current_thing]([SSfastprocess.current_thing.type]) - currentrun: [SSfastprocess.currentrun.len] vs total: [SSfastprocess.processing.len]")
+	var/list/old_processing = SSfastprocess.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D

code/controllers/subsystems/processing/obj.dm

@@ -3,3 +3,14 @@ PROCESSING_SUBSYSTEM_DEF(obj)
 	priority = FIRE_PRIORITY_OBJ
 	flags = SS_NO_INIT
 	wait = 20
+
+/datum/controller/subsystem/processing/obj/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSobj.current_thing)
+		log_debug("current_thing was: (\ref[SSobj.current_thing])[SSobj.current_thing]([SSobj.current_thing.type]) - currentrun: [SSobj.currentrun.len] vs total: [SSobj.processing.len]")
+	var/list/old_processing = SSobj.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(!isobj(D))
+			log_debug("[name] subsystem Recover() found inappropriate item in list: [D.type]")
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D

code/controllers/subsystems/processing/processing.dm

@@ -13,6 +13,16 @@ SUBSYSTEM_DEF(processing)
 
 	var/debug_last_thing
 	var/debug_original_process_proc // initial() does not work with procs
+	var/datum/current_thing
+
+/datum/controller/subsystem/processing/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSprocessing.current_thing)
+		log_debug("current_thing was: (\ref[SSprocessing.current_thing])[SSprocessing.current_thing]([SSprocessing.current_thing.type]) - currentrun: [SSprocessing.currentrun.len] vs total: [SSprocessing.processing.len]")
+	var/list/old_processing = SSprocessing.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D
 
 /datum/controller/subsystem/processing/stat_entry()
 	..("[stat_tag]:[processing.len]")
@@ -24,16 +34,19 @@ SUBSYSTEM_DEF(processing)
 	var/list/current_run = currentrun
 
 	while(current_run.len)
-		var/datum/thing = current_run[current_run.len]
+		current_thing = current_run[current_run.len]
 		current_run.len--
-		if(QDELETED(thing))
-			processing -= thing
-		else if(thing.process(wait) == PROCESS_KILL)
+		if(QDELETED(current_thing))
+			processing -= current_thing
+		else if(current_thing.process(wait) == PROCESS_KILL)
 			// fully stop so that a future START_PROCESSING will work
-			STOP_PROCESSING(src, thing)
+			STOP_PROCESSING(src, current_thing)
 		if (MC_TICK_CHECK)
+			current_thing = null
 			return
 
+	current_thing = null
+
 /datum/controller/subsystem/processing/proc/toggle_debug()
 	if(!check_rights(R_DEBUG))
 		return

code/controllers/subsystems/processing/projectiles.dm

@@ -8,6 +8,15 @@ PROCESSING_SUBSYSTEM_DEF(projectiles)
 	var/global_pixel_speed = 2
 	var/global_iterations_per_move = 16
 
+/datum/controller/subsystem/processing/projectiles/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSprojectiles.current_thing)
+		log_debug("current_thing was: (\ref[SSprojectiles.current_thing])[SSprojectiles.current_thing]([SSprojectiles.current_thing.type]) - currentrun: [SSprojectiles.currentrun.len] vs total: [SSprojectiles.processing.len]")
+	var/list/old_processing = SSprojectiles.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D
+
 /datum/controller/subsystem/processing/projectiles/proc/set_pixel_speed(new_speed)
 	global_pixel_speed = new_speed
 	for(var/i in processing)

code/controllers/subsystems/processing/turfs.dm

@@ -1,3 +1,14 @@
 PROCESSING_SUBSYSTEM_DEF(turfs)
 	name = "Turf Processing"
 	wait = 20
+
+/datum/controller/subsystem/processing/turfs/Recover()
+	log_debug("[name] subsystem Recover().")
+	if(SSturfs.current_thing)
+		log_debug("current_thing was: (\ref[SSturfs.current_thing])[SSturfs.current_thing]([SSturfs.current_thing.type]) - currentrun: [SSturfs.currentrun.len] vs total: [SSturfs.processing.len]")
+	var/list/old_processing = SSturfs.processing.Copy()
+	for(var/datum/D in old_processing)
+		if(!isturf(D))
+			log_debug("[name] subsystem Recover() found inappropriate item in list: [D.type]")
+		if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
+			processing |= D