Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war

In which the stoner one gets stoned and tries to address tick contention... again
This commit is contained in:
Jordan Brown
2017-10-10 14:27:59 -04:00
committed by CitadelStationBot
parent f8d0646b09
commit 7b30be0058
21 changed files with 72 additions and 54 deletions
+3 -3
View File
@@ -61,7 +61,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
var/t = 0
var/timeout_time = (ASSET_CACHE_SEND_TIMEOUT * client.sending.len) + ASSET_CACHE_SEND_TIMEOUT
while(client && !client.completed_asset_jobs.Find(job) && t < timeout_time) // Reception is handled in Topic()
sleep(1) // Lock up the caller until this is received.
stoplag(1) // Lock up the caller until this is received.
t++
if(client)
@@ -112,7 +112,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
var/t = 0
var/timeout_time = ASSET_CACHE_SEND_TIMEOUT * client.sending.len
while(client && !client.completed_asset_jobs.Find(job) && t < timeout_time) // Reception is handled in Topic()
sleep(1) // Lock up the caller until this is received.
stoplag(1) // Lock up the caller until this is received.
t++
if(client)
@@ -131,7 +131,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
if (register_asset)
register_asset(file,files[file])
send_asset(client,file)
sleep(0) //queuing calls like this too quickly can cause issues in some client versions
stoplag(0) //queuing calls like this too quickly can cause issues in some client versions
//This proc "registers" an asset, it adds it to the cache for further use, you cannot touch it from this point on or you'll fuck things up.
//if it's an icon or something be careful, you'll have to copy it before further use.
+2 -3
View File
@@ -631,10 +631,9 @@ GLOBAL_LIST(external_rsc_urls)
/client/Stat()
. = ..()
if (holder)
sleep(1)
stoplag(1)
else
sleep(5)
stoplag()
stoplag(5)
//send resources to the client. It's here in its own proc so we can move it around easiliy if need be
/client/proc/send_resources()