From ae3fa1785ecedfa2b5ab33843567b407936046f5 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 19 Feb 2024 16:47:12 -0500 Subject: [PATCH] Change all `sleep(1)`s into `sleep(world.tick_lag)`s --- src/DMAPI/tgs/core/datum.dm | 4 ++-- src/DMAPI/tgs/v4/api.dm | 6 +++--- src/DMAPI/tgs/v5/api.dm | 4 ++-- src/DMAPI/tgs/v5/bridge.dm | 2 +- tests/DMAPI/LongRunning/Test.dm | 4 ++-- tests/DMAPI/test_setup.dm | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/DMAPI/tgs/core/datum.dm b/src/DMAPI/tgs/core/datum.dm index fefca3af2f..898516f124 100644 --- a/src/DMAPI/tgs/core/datum.dm +++ b/src/DMAPI/tgs/core/datum.dm @@ -17,7 +17,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866 del(world) world.sleep_offline = FALSE // just in case, this is BYOND after all... - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]") /datum/tgs_api/latest @@ -69,6 +69,6 @@ TGS_PROTECT_DATUM(/datum/tgs_api) /datum/tgs_api/proc/Visibility() return TGS_UNIMPLEMENTED - + /datum/tgs_api/proc/TriggerEvent(event_name, list/parameters, wait_for_completion) return FALSE diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index 945e2e4117..7c87922750 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -181,7 +181,7 @@ var/json = json_encode(data) while(requesting_new_port && !override_requesting_new_port) - sleep(1) + sleep(world.tick_lag) //we need some port open at this point to facilitate return communication if(!world.port) @@ -209,7 +209,7 @@ requesting_new_port = FALSE while(export_lock) - sleep(1) + sleep(world.tick_lag) export_lock = TRUE last_interop_response = null @@ -217,7 +217,7 @@ text2file(json, server_commands_json_path) for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I) - sleep(1) + sleep(world.tick_lag) if(!last_interop_response) TGS_ERROR_LOG("Failed to get export result for: [json]") diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm index 32d09544ea..ffdde1ae20 100644 --- a/src/DMAPI/tgs/v5/api.dm +++ b/src/DMAPI/tgs/v5/api.dm @@ -127,7 +127,7 @@ TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") logged = TRUE - sleep(1) + sleep(world.tick_lag) TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed") @@ -279,7 +279,7 @@ pending_events[event_id] = TRUE do - sleep(1) + sleep(world.tick_lag) while(pending_events[event_id]) TGS_DEBUG_LOG("Completed wait on event ID: [event_id]") diff --git a/src/DMAPI/tgs/v5/bridge.dm b/src/DMAPI/tgs/v5/bridge.dm index d986ec7e73..763ab3e02b 100644 --- a/src/DMAPI/tgs/v5/bridge.dm +++ b/src/DMAPI/tgs/v5/bridge.dm @@ -65,7 +65,7 @@ if(detached) // Wait up to one minute for(var/i in 1 to 600) - sleep(1) + sleep(world.tick_lag) if(!detached && (!require_channels || length(chat_channels))) break diff --git a/tests/DMAPI/LongRunning/Test.dm b/tests/DMAPI/LongRunning/Test.dm index f4468953a7..2735c8e0ab 100644 --- a/tests/DMAPI/LongRunning/Test.dm +++ b/tests/DMAPI/LongRunning/Test.dm @@ -203,7 +203,7 @@ var/run_bridge_test DetachedChatMessageQueuingP2() /proc/DetachedChatMessageQueuingP2() - sleep(1) + sleep(world.tick_lag) DetachedChatMessageQueuingP3() /proc/DetachedChatMessageQueuingP3() @@ -240,7 +240,7 @@ var/received_health_check = FALSE DelayCheckDetach() /proc/DelayCheckDetach() - sleep(1) + sleep(world.tick_lag) // hack hack, calling world.TgsChatChannelInfo() will try to delay until the channels come back var/datum/tgs_api/v5/api = TGS_READ_GLOBAL(tgs) if(length(api.chat_channels)) diff --git a/tests/DMAPI/test_setup.dm b/tests/DMAPI/test_setup.dm index 56f4c03eb8..ac345230b7 100644 --- a/tests/DMAPI/test_setup.dm +++ b/tests/DMAPI/test_setup.dm @@ -32,4 +32,4 @@ text2file(reason, "test_fail_reason.txt") world.log << "Terminating..." del(world) - sleep(1) // https://www.byond.com/forum/post/2894866 + sleep(world.tick_lag) // https://www.byond.com/forum/post/2894866