dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use new GC API to turn off nursery size heuristic

Browse source 
Refs: #7714
This commit is contained in:
Itms 2025-09-03 12:04:22 +02:00
parent edff153f73
commit bb6f14aeaa
No known key found for this signature in database
GPG key ID: C7E52BD14CE14E09
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/scriptinterface/Context.cpp
View file

@ -20,7 +20,6 @@
#include "Context.h" #include "Context.h"
#include "js/Modules.h" #include "js/Modules.h"
#include "js/friend/PerformanceHint.h"
#include "lib/alignment.h" #include "lib/alignment.h"
#include "lib/debug.h" #include "lib/debug.h"
#include "ps/Profile.h" #include "ps/Profile.h"
@ -137,6 +136,9 @@ Context::Context(int contextSize, uint32_t heapGrowthBytesGCTrigger):
JS_SetGCParameter(m_cx, JSGC_SLICE_TIME_BUDGET_MS, 6); JS_SetGCParameter(m_cx, JSGC_SLICE_TIME_BUDGET_MS, 6);
JS_SetGCParameter(m_cx, JSGC_MIN_LAST_DITCH_GC_PERIOD, 0); JS_SetGCParameter(m_cx, JSGC_MIN_LAST_DITCH_GC_PERIOD, 0);
// Turn off nursery size heuristic.
// See https://gitea.wildfiregames.com/0ad/0ad/issues/7714 for details.
JS_SetGCParameter(m_cx, JSGC_NURSERY_MAX_TIME_GOAL_MS, 0);
JS_SetOffthreadIonCompilationEnabled(m_cx, true); JS_SetOffthreadIonCompilationEnabled(m_cx, true);
@ -155,10 +157,6 @@ Context::Context(int contextSize, uint32_t heapGrowthBytesGCTrigger):
JS_SetGlobalJitCompilerOption(m_cx, JSJITCOMPILER_SPECTRE_STRING_MITIGATIONS, 0); JS_SetGlobalJitCompilerOption(m_cx, JSJITCOMPILER_SPECTRE_STRING_MITIGATIONS, 0);
JS_SetGlobalJitCompilerOption(m_cx, JSJITCOMPILER_SPECTRE_OBJECT_MITIGATIONS, 0); JS_SetGlobalJitCompilerOption(m_cx, JSJITCOMPILER_SPECTRE_OBJECT_MITIGATIONS, 0);
// Workaround to turn off nursery size heuristic.
// See https://gitea.wildfiregames.com/0ad/0ad/issues/7714 for details.
js::gc::SetPerformanceHint(m_cx, js::gc::PerformanceHint::InPageLoad);
Engine::GetSingleton().RegisterContext(m_cx); Engine::GetSingleton().RegisterContext(m_cx);
JS::SetJobQueue(m_cx, m_JobQueue.get()); JS::SetJobQueue(m_cx, m_JobQueue.get());
@ -179,9 +177,6 @@ Context::~Context()
JS::SetModuleResolveHook(runtime, nullptr); JS::SetModuleResolveHook(runtime, nullptr);
JS::SetModuleMetadataHook(runtime, nullptr); JS::SetModuleMetadataHook(runtime, nullptr);
// Switch back to normal performance mode to avoid assertion in debug mode.
js::gc::SetPerformanceHint(m_cx, js::gc::PerformanceHint::Normal);
JS_DestroyContext(m_cx); JS_DestroyContext(m_cx);
Engine::GetSingleton().UnRegisterContext(m_cx); Engine::GetSingleton().UnRegisterContext(m_cx);
} }
@ -291,4 +286,4 @@ void Context::PrepareZonesForIncrementalGC() const
JS::PrepareZoneForGC(m_cx, js::GetRealmZone(realm)); JS::PrepareZoneForGC(m_cx, js::GetRealmZone(realm));
} }
} // namespace Script } // namespace Script