mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-22 05:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SM60 2/2] Update to Spidermonkey 60 APIs

Browse Source 
Two noteworthy changes:
- Proxies are update to the SM60 API, having an explicit reserved slot
and a private slot, in which the 'proxy data' and the C++ object are
stored. This fixes a debug assertion failure of SM52 (See bugs 1237504
and 1339411)
- The GC callback behaviour has changed slightly, and we should now only
look for GC_SLICE_BEGIN and GC_SLICE_END calls (Bug 1364547)

Other updates are minor:
- Bug 1339036: JSTYPE_VOID beomes JSTYPE_UNDEFINED
- Bug 1308236 - avoid ambiguous comparison by changing NULL to nullptr
- Bug 1421358, GC::reason::REFRESH_FRAME was removed. API is indicated
in jsapi.h so use that.
- Compartment behaviours update
- ClassOps changes (Bug 1389510 removed the getter/setter - 7c04ea0211 -
and bug 1370608 added one more before that so net minus one)
- Minor tests touchups again.

Tested by: SubitaNeo, Stan
Thanks to bellaz89 for the Shared Array fix

Closes #5859

Differential Revision: https://code.wildfiregames.com/D3116
This was SVN commit r24243.
This commit is contained in:
wraitii
2020-11-24 15:47:03 +00:00
parent f2cf2c97ad
commit d07f271d60
12 changed files with 41 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptContext.cpp
+12 -26
View File
@@ -27,15 +27,13 @@
void GCSliceCallbackHook(JSContext* UNUSED(cx), JS::GCProgress progress, const JS::GCDescription& UNUSED(desc))
{
/*
* During non-incremental GC, the GC is bracketed by JSGC_CYCLE_BEGIN/END
* callbacks. During an incremental GC, the sequence of callbacks is as
* follows:
* JSGC_CYCLE_BEGIN, JSGC_SLICE_END (first slice)
* JSGC_SLICE_BEGIN, JSGC_SLICE_END (second slice)
* ...
* JSGC_SLICE_BEGIN, JSGC_CYCLE_END (last slice)
*/
/**
* From the GCAPI.h file:
* > During GC, the GC is bracketed by GC_CYCLE_BEGIN/END callbacks. Each
* > slice between those (whether an incremental or the sole non-incremental
* > slice) is bracketed by GC_SLICE_BEGIN/GC_SLICE_END.
* Thus, to safely monitor GCs, we need to profile SLICE_X calls.
*/
if (progress == JS::GC_SLICE_BEGIN)
@@ -48,19 +46,7 @@ void GCSliceCallbackHook(JSContext* UNUSED(cx), JS::GCProgress progress, const J
{
if (CProfileManager::IsInitialised() && ThreadUtil::IsMainThread())
g_Profiler.Stop();
g_Profiler2.RecordRegionLeave();
}
else if (progress == JS::GC_CYCLE_BEGIN)
{
if (CProfileManager::IsInitialised() && ThreadUtil::IsMainThread())
g_Profiler.Start("GCSlice");
g_Profiler2.RecordRegionEnter("GCSlice");
}
else if (progress == JS::GC_CYCLE_END)
{
if (CProfileManager::IsInitialised() && ThreadUtil::IsMainThread())
g_Profiler.Stop();
g_Profiler2.RecordRegionLeave();
g_Profiler2.RecordRegionLeave();
}
// The following code can be used to print some information aobut garbage collection
@@ -219,7 +205,7 @@ void ScriptContext::MaybeIncrementalGC(double delay)
printf("Finishing incremental GC because gcBytes > m_ContextSize / 2. \n");
#endif
PrepareCompartmentsForIncrementalGC();
JS::FinishIncrementalGC(m_cx, JS::gcreason::REFRESH_FRAME);
JS::FinishIncrementalGC(m_cx, JS::gcreason::API);
}
else
{
@@ -249,9 +235,9 @@ void ScriptContext::MaybeIncrementalGC(double delay)
#endif
PrepareCompartmentsForIncrementalGC();
if (!JS::IsIncrementalGCInProgress(m_cx))
JS::StartIncrementalGC(m_cx, GC_NORMAL, JS::gcreason::REFRESH_FRAME, GCSliceTimeBudget);
JS::StartIncrementalGC(m_cx, GC_NORMAL, JS::gcreason::API, GCSliceTimeBudget);
else
JS::IncrementalGCSlice(m_cx, JS::gcreason::REFRESH_FRAME, GCSliceTimeBudget);
JS::IncrementalGCSlice(m_cx, JS::gcreason::API, GCSliceTimeBudget);
}
m_LastGCBytes = gcBytes;
}
@@ -262,7 +248,7 @@ void ScriptContext::ShrinkingGC()
{
JS_SetGCParameter(m_cx, JSGC_MODE, JSGC_MODE_ZONE);
JS::PrepareForFullGC(m_cx);
JS::GCForReason(m_cx, GC_SHRINK, JS::gcreason::REFRESH_FRAME);
JS::GCForReason(m_cx, GC_SHRINK, JS::gcreason::API);
JS_SetGCParameter(m_cx, JSGC_MODE, JSGC_MODE_INCREMENTAL);
}