From 83396d41dfe6ce0fd4f8fb74c96628bd01e0012f Mon Sep 17 00:00:00 2001
From: Tastyfish <crazychris32@gmail.com>
Date: Mon, 29 Feb 2016 15:48:49 -0500
Subject: [PATCH] Removes btime dependency, makes sleep check happen on Every
 SCHECK

---
 btime.dll                                     | Bin 6656 -> 0 bytes
 code/__DEFINES/btime.dm                       |  18 --------
 code/__DEFINES/process_scheduler.dm           |   2 +-
 code/__HELPERS/time.dm                        |  26 ++++++++++--
 .../ProcessScheduler/core/_stubs.dm           |  27 ------------
 .../ProcessScheduler/core/process.dm          |  39 +++++-------------
 .../ProcessScheduler/core/processScheduler.dm |  13 ++----
 code/game/objects/explosion.dm                |   5 +--
 paradise.dme                                  |   2 -
 9 files changed, 39 insertions(+), 93 deletions(-)
 delete mode 100644 btime.dll
 delete mode 100644 code/__DEFINES/btime.dm
 delete mode 100644 code/controllers/ProcessScheduler/core/_stubs.dm

diff --git a/btime.dll b/btime.dll
deleted file mode 100644
index 36dcbe3af7561942191dde97718a2844dc2a23ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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
UT~v2k*RPA|<a&i3gzr%M7ichE<p2Nx

diff --git a/code/__DEFINES/btime.dm b/code/__DEFINES/btime.dm
deleted file mode 100644
index 33d5def1deb..00000000000
--- a/code/__DEFINES/btime.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-// Comment this out if the external btime library is unavailable
-#define PRECISE_TIMER_AVAILABLE
-
-#ifdef PRECISE_TIMER_AVAILABLE
-var/global/__btime__libName = "btime.[world.system_type==MS_WINDOWS?"dll":"so"]"
-#define TimeOfHour (__extern__timeofhour)
-#define __extern__timeofhour text2num(call(__btime__libName, "gettime")())
-/hook/startup/proc/checkbtime()
-	try
-		// This will always return 1 unless the btime library cannot be accessed
-		if(TimeOfHour || 1) return 1
-	catch(var/exception/e)
-		log_to_dd("PRECISE_TIMER_AVAILABLE is defined in btime.dm, but calling the btime library failed: [e]")
-		log_to_dd("This is a fatal error. The world will now shut down.")
-		del(world)
-#else
-#define TimeOfHour (world.timeofday % 36000)
-#endif
diff --git a/code/__DEFINES/process_scheduler.dm b/code/__DEFINES/process_scheduler.dm
index af859e314ff..d9c8f106efc 100644
--- a/code/__DEFINES/process_scheduler.dm
+++ b/code/__DEFINES/process_scheduler.dm
@@ -16,4 +16,4 @@
 // SCHECK macros
 // This references src directly to work around a weird bug with try/catch
 #define SCHECK_EVERY(this_many_calls) if(++src.calls_since_last_scheck >= this_many_calls) sleepCheck()
-#define SCHECK SCHECK_EVERY(50)
+#define SCHECK sleepCheck()
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 1bdd85841a5..4973de14b81 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -3,6 +3,25 @@
 #define MINUTES *600
 #define HOURS   *36000
 
+#define TimeOfGame (get_game_time())
+#define TimeOfTick (world.tick_usage*0.01*world.tick_lag)
+
+/proc/get_game_time()
+	var/global/time_offset = 0
+	var/global/last_time = 0
+	var/global/last_usage = 0
+
+	var/wtime = world.time
+	var/wusage = world.tick_usage * 0.01
+
+	if(last_time < wtime && last_usage > 1)
+		time_offset += last_usage - 1
+
+	last_time = wtime
+	last_usage = wusage
+
+	return wtime + (time_offset + wusage) * world.tick_lag
+
 //Returns the world time in english
 /proc/worldtime2text(time = world.time)
 	return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
@@ -33,15 +52,14 @@ proc/isDay(var/month, var/day)
  * Returns "watch handle" (really just a timestamp :V)
  */
 /proc/start_watch()
-	return world.timeofday
+	return TimeOfGame
 
 /**
  * Returns number of seconds elapsed.
  * @param wh number The "Watch Handle" from start_watch(). (timestamp)
  */
 /proc/stop_watch(wh)
-	return round(0.1*(world.timeofday-wh),0.1)
+	return round(0.1 * (TimeOfGame - wh), 0.1)
 	
 /proc/month2number(month)
-	return month_names.Find(month)
-	
\ No newline at end of file
+	return month_names.Find(month)
\ No newline at end of file
diff --git a/code/controllers/ProcessScheduler/core/_stubs.dm b/code/controllers/ProcessScheduler/core/_stubs.dm
deleted file mode 100644
index 94f4cc1fc4b..00000000000
--- a/code/controllers/ProcessScheduler/core/_stubs.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * _stubs.dm
- *
- * This file contains constructs that the process scheduler expects to exist
- * in a standard ss13 fork.
- */
-/*
-/**
- * message_admins
- *
- * sends a message to admins
- */
-/proc/message_admins(msg)
-	world << msg
-*/
-/**
- * logTheThing
- *
- * In goonstation, this proc writes a message to either the world log or diary.
- *
- * Blame Keelin.
- */
-/proc/logTheThing(type, source, target, text, diaryType)
-	if(diaryType)
-		world << "Diary: \[[diaryType]:[type]] [text]"
-	else
-		world << "Log: \[[type]] [text]"
diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm
index b7767c367fd..27ba2479ae5 100644
--- a/code/controllers/ProcessScheduler/core/process.dm
+++ b/code/controllers/ProcessScheduler/core/process.dm
@@ -69,10 +69,10 @@
 	 * recordkeeping vars
 	 */
 
-	// Records the time (1/10s timeofday) at which the process last finished sleeping
+	// Records the time (1/10s timeoftick) at which the process last finished sleeping
 	var/tmp/last_slept = 0
 
-	// Records the time (1/10s timeofday) at which the process last began running
+	// Records the time (1/10s timeofgame) at which the process last began running
 	var/tmp/run_start = 0
 
 	// Records the number of times this process has been killed and restarted
@@ -106,12 +106,8 @@
 	last_object = null
 
 /datum/controller/process/proc/started()
-	var/timeofhour = TimeOfHour
-	// Initialize last_slept so we can know when to sleep
-	last_slept = timeofhour
-
 	// Initialize run_start so we can detect hung processes.
-	run_start = timeofhour
+	run_start = TimeOfGame
 
 	// Initialize defer count
 	cpu_defer_count = 0
@@ -163,18 +159,13 @@
 	setStatus(PROCESS_STATUS_HUNG)
 
 /datum/controller/process/proc/handleHung()
-	var/timeofhour = TimeOfHour
 	var/datum/lastObj = last_object
 	var/lastObjType = "null"
 	if(istype(lastObj))
 		lastObjType = lastObj.type
 
-	// If timeofhour has rolled over, then we need to adjust.
-	if (timeofhour < run_start)
-		run_start -= 36000
-	var/msg = "[name] process hung at tick #[ticks]. Process was unresponsive for [(timeofhour - run_start) / 10] seconds and was restarted. Last task: [last_task]. Last Object Type: [lastObjType]"
-	logTheThing("debug", null, null, msg)
-	logTheThing("diary", null, null, msg, "debug")
+	var/msg = "[name] process hung at tick #[ticks]. Process was unresponsive for [(TimeOfGame - run_start) / 10] seconds and was restarted. Last task: [last_task]. Last Object Type: [lastObjType]"
+	log_debug(msg)
 	message_admins(msg)
 
 	main.restartProcess(src.name)
@@ -182,8 +173,8 @@
 /datum/controller/process/proc/kill()
 	if (!killed)
 		var/msg = "[name] process was killed at tick #[ticks]."
-		logTheThing("debug", null, null, msg)
-		logTheThing("diary", null, null, msg, "debug")
+		log_debug(msg)
+		message_admins(msg)
 		//finished()
 
 		// Allow inheritors to clean up if needed
@@ -208,17 +199,12 @@
 	if (main.getCurrentTickElapsedTime() > main.timeAllowance)
 		sleep(world.tick_lag)
 		cpu_defer_count++
-		last_slept = TimeOfHour
+		last_slept = 0
 	else
-		var/timeofhour = TimeOfHour
-		// If timeofhour has rolled over, then we need to adjust.
-		if (timeofhour < last_slept)
-			last_slept -= 36000
-
-		if (timeofhour > last_slept + sleep_interval)
+		if (TimeOfTick > last_slept + sleep_interval)
 			// If we haven't slept in sleep_interval deciseconds, sleep to allow other work to proceed.
 			sleep(0)
-			last_slept = TimeOfHour
+			last_slept = TimeOfTick
 
 /datum/controller/process/proc/update()
 	// Clear delta
@@ -239,10 +225,7 @@
 
 
 /datum/controller/process/proc/getElapsedTime()
-	var/timeofhour = TimeOfHour
-	if (timeofhour < run_start)
-		return timeofhour - (run_start - 36000)
-	return timeofhour - run_start
+	return TimeOfGame - run_start
 
 /datum/controller/process/proc/tickDetail()
 	return
diff --git a/code/controllers/ProcessScheduler/core/processScheduler.dm b/code/controllers/ProcessScheduler/core/processScheduler.dm
index eccb44c49c5..1c6a0c91a28 100644
--- a/code/controllers/ProcessScheduler/core/processScheduler.dm
+++ b/code/controllers/ProcessScheduler/core/processScheduler.dm
@@ -43,8 +43,6 @@ var/global/datum/controller/processScheduler/processScheduler
 
 	var/tmp/currentTick = 0
 
-	var/tmp/currentTickStart = 0
-
 	var/tmp/timeAllowance = 0
 
 	var/tmp/cpuAverage = 0
@@ -247,7 +245,7 @@ var/global/datum/controller/processScheduler/processScheduler
 
 /datum/controller/processScheduler/proc/recordStart(var/datum/controller/process/process, var/time = null)
 	if (isnull(time))
-		time = TimeOfHour
+		time = TimeOfGame
 		last_queued[process] = world.time
 		last_start[process] = time
 	else
@@ -256,11 +254,7 @@ var/global/datum/controller/processScheduler/processScheduler
 
 /datum/controller/processScheduler/proc/recordEnd(var/datum/controller/process/process, var/time = null)
 	if (isnull(time))
-		time = TimeOfHour
-
-	// If world.timeofday has rolled over, then we need to adjust.
-	if (time < last_start[process])
-		last_start[process] -= 36000
+		time = TimeOfGame
 
 	var/lastRunTime = time - last_start[process]
 
@@ -349,13 +343,12 @@ var/global/datum/controller/processScheduler/processScheduler
 		updateCurrentTickData()
 		return 0
 	else
-		return TimeOfHour - currentTickStart
+		return TimeOfTick
 
 /datum/controller/processScheduler/proc/updateCurrentTickData()
 	if (world.time > currentTick)
 		// New tick!
 		currentTick = world.time
-		currentTickStart = TimeOfHour
 		updateTimeAllowance()
 		cpuAverage = (world.cpu + cpuAverage + cpuAverage) / 3
 
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 068e3144e73..caaf79a9981 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -31,7 +31,7 @@
 		flame_range = min (MAX_EX_FLAME_RANGE, flame_range)
 
 	spawn(0)
-		var/start = TimeOfHour
+		var/watch = start_watch()
 		if(!epicenter) return
 
 		var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range)
@@ -157,8 +157,7 @@
 								var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
 								I.throw_at(throw_at, throw_range, 2, no_spin = 1) //Throw it at 2 speed, this is purely visual anyway; don't spin the thrown items, it's very costly.
 */
-		var/timeofhour = TimeOfHour
-		var/took = round((start <= timeofhour) ? ((timeofhour-start)/10) : ((timeofhour-(start-36000))/10), 0.01)
+		var/took = stop_watch(watch)
 		//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes  to explosion code using this please so we can compare
 		if(Debug2)	log_to_dd("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
 
diff --git a/paradise.dme b/paradise.dme
index af0eb57e422..b796d5cd55d 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -17,7 +17,6 @@
 #include "code\__DEFINES\_readme.dm"
 #include "code\__DEFINES\admin.dm"
 #include "code\__DEFINES\atmospherics.dm"
-#include "code\__DEFINES\btime.dm"
 #include "code\__DEFINES\clothing.dm"
 #include "code\__DEFINES\combat.dm"
 #include "code\__DEFINES\flags.dm"
@@ -173,7 +172,6 @@
 #include "code\controllers\Processes\vote.dm"
 #include "code\controllers\Processes\shuttles\emergency.dm"
 #include "code\controllers\Processes\shuttles\supply.dm"
-#include "code\controllers\ProcessScheduler\core\_stubs.dm"
 #include "code\controllers\ProcessScheduler\core\process.dm"
 #include "code\controllers\ProcessScheduler\core\processScheduler.dm"
 #include "code\datums\ai_law_sets.dm"