mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-09 16:33:50 +00:00
5fa115de27
Asset cache now caches the asset's md5 This should solve the high cpu usage issues with it. line by line profile suggests that the next hotspot is the asset log. Simplied asset cache code, moved verify functionality to a flush_assets proc that blocks until a client has all currently sending assets. (sidenote: there is an argument for moving most of asset_cache's global procs onto the client, get_asset_datum and register_asset are really the only valid global procs.) Re-added batched passive sends since it does speed up how quickly the asset cache pre-caches to clients.
59 lines
2.9 KiB
Plaintext
59 lines
2.9 KiB
Plaintext
|
|
/client
|
|
var/list/sent_assets = list() // List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
|
|
var/list/completed_asset_jobs = list() /// List of all completed blocking send jobs awaiting acknowledgement by send_asset
|
|
|
|
var/last_asset_job = 0 /// Last asset send job id.
|
|
var/last_completed_asset_job = 0
|
|
|
|
/// Process asset cache client topic calls for "asset_cache_confirm_arrival=[INT]"
|
|
/client/proc/asset_cache_confirm_arrival(job_id)
|
|
var/asset_cache_job = round(text2num(job_id))
|
|
//because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us into letting them append to a list without limit.
|
|
if (asset_cache_job > 0 && asset_cache_job <= last_asset_job && !(completed_asset_jobs["[asset_cache_job]"]))
|
|
completed_asset_jobs["[asset_cache_job]"] = TRUE
|
|
last_completed_asset_job = max(last_completed_asset_job, asset_cache_job)
|
|
else
|
|
return asset_cache_job || TRUE
|
|
|
|
|
|
/// Process asset cache client topic calls for "asset_cache_preload_data=[HTML+JSON_STRING]
|
|
/client/proc/asset_cache_preload_data(data)
|
|
/*var/jsonend = findtextEx(data, "{{{ENDJSONDATA}}}")
|
|
if (!jsonend)
|
|
CRASH("invalid asset_cache_preload_data, no jsonendmarker")*/
|
|
//var/json = html_decode(copytext(data, 1, jsonend))
|
|
var/json = data
|
|
var/list/preloaded_assets = json_decode(json)
|
|
|
|
for (var/preloaded_asset in preloaded_assets)
|
|
if (copytext(preloaded_asset, findlasttext(preloaded_asset, ".")+1) in list("js", "jsm", "htm", "html"))
|
|
preloaded_assets -= preloaded_asset
|
|
continue
|
|
sent_assets |= preloaded_assets
|
|
|
|
|
|
/// Updates the client side stored html/json combo file used to keep track of what assets the client has between restarts/reconnects.
|
|
/client/proc/asset_cache_update_json(verify = FALSE, list/new_assets = list())
|
|
if (world.time - connection_time < 10 SECONDS) //don't override the existing data file on a new connection
|
|
return
|
|
if (!islist(new_assets))
|
|
new_assets = list("[new_assets]" = md5(SSassets.cache[new_assets]))
|
|
|
|
src << browse(json_encode(new_assets|sent_assets), "file=asset_data.json&display=0")
|
|
|
|
/// Blocks until all currently sending browser assets have been sent.
|
|
/// Due to byond limitations, this proc will sleep for 1 client round trip even if the client has no pending asset sends.
|
|
/// This proc will return an untrue value if it had to return before confirming the send, such as timeout or the client going away.
|
|
/client/proc/asset_flush(timeout = 50)
|
|
var/job = ++last_asset_job
|
|
var/t = 0
|
|
var/timeout_time = timeout
|
|
src << browse({"<script>window.location.href="?asset_cache_confirm_arrival=[job]"</script>"}, "window=asset_cache_browser&file=asset_cache_send_verify.htm")
|
|
|
|
while(!completed_asset_jobs["[job]"] && t < timeout_time) // Reception is handled in Topic()
|
|
stoplag(1) // Lock up the caller until this is received.
|
|
t++
|
|
if (t < timeout_time)
|
|
return TRUE
|