mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-10-14 07:17:44 +00:00
Actually remove trailing whitespace for non-header files as well.
This was SVN commit r18989.
This commit is contained in:
@@ -305,10 +305,10 @@ template<> void ScriptInterface::ToJSVal<unsigned long>(JSContext* UNUSED(cx), J
|
||||
ret.set(JS::NumberValue((int)val));
|
||||
}
|
||||
|
||||
// (s)size_t are considered to be identical to (unsigned) int by GCC and
|
||||
// their specializations would cause conflicts there. On x86_64 GCC, s/size_t
|
||||
// is equivalent to (unsigned) long, but the same solution applies; use the
|
||||
// long and unsigned long specializations instead of s/size_t.
|
||||
// (s)size_t are considered to be identical to (unsigned) int by GCC and
|
||||
// their specializations would cause conflicts there. On x86_64 GCC, s/size_t
|
||||
// is equivalent to (unsigned) long, but the same solution applies; use the
|
||||
// long and unsigned long specializations instead of s/size_t.
|
||||
// for some reason, x64 MSC treats size_t as distinct from unsigned long:
|
||||
#if MSC_VERSION && ARCH_AMD64
|
||||
|
||||
|
||||
@@ -729,7 +729,7 @@ bool ScriptInterface::GetPropertyInt_(JS::HandleValue obj, int name, JS::Mutable
|
||||
|
||||
bool ScriptInterface::HasProperty(JS::HandleValue obj, const char* name)
|
||||
{
|
||||
// TODO: proper errorhandling
|
||||
// TODO: proper errorhandling
|
||||
JSAutoRequest rq(m->m_cx);
|
||||
if (!obj.isObject())
|
||||
return false;
|
||||
|
||||
@@ -159,16 +159,16 @@ void ScriptRuntime::MaybeIncrementalGC(double delay)
|
||||
if (JS::IsIncrementalGCEnabled(m_rt))
|
||||
{
|
||||
// The idea is to get the heap size after a completed GC and trigger the next GC when the heap size has
|
||||
// reached m_LastGCBytes + X.
|
||||
// reached m_LastGCBytes + X.
|
||||
// In practice it doesn't quite work like that. When the incremental marking is completed, the sweeping kicks in.
|
||||
// The sweeping actually frees memory and it does this in a background thread (if JS_USE_HELPER_THREADS is set).
|
||||
// While the sweeping is happening we already run scripts again and produce new garbage.
|
||||
|
||||
const int GCSliceTimeBudget = 30; // Milliseconds an incremental slice is allowed to run
|
||||
|
||||
// Have a minimum time in seconds to wait between GC slices and before starting a new GC to distribute the GC
|
||||
// load and to hopefully make it unnoticeable for the player. This value should be high enough to distribute
|
||||
// the load well enough and low enough to make sure we don't run out of memory before we can start with the
|
||||
// Have a minimum time in seconds to wait between GC slices and before starting a new GC to distribute the GC
|
||||
// load and to hopefully make it unnoticeable for the player. This value should be high enough to distribute
|
||||
// the load well enough and low enough to make sure we don't run out of memory before we can start with the
|
||||
// sweeping.
|
||||
if (timer_Time() - m_LastGCCheck < delay)
|
||||
return;
|
||||
@@ -189,7 +189,7 @@ void ScriptRuntime::MaybeIncrementalGC(double delay)
|
||||
m_LastGCBytes = gcBytes;
|
||||
}
|
||||
|
||||
// Run an additional incremental GC slice if the currently running incremental GC isn't over yet
|
||||
// Run an additional incremental GC slice if the currently running incremental GC isn't over yet
|
||||
// ... or
|
||||
// start a new incremental GC if the JS heap size has grown enough for a GC to make sense
|
||||
if (JS::IsIncrementalGCInProgress(m_rt) || (gcBytes - m_LastGCBytes > m_HeapGrowthBytesGCTrigger))
|
||||
@@ -199,9 +199,9 @@ void ScriptRuntime::MaybeIncrementalGC(double delay)
|
||||
printf("An incremental GC cycle is in progress. \n");
|
||||
else
|
||||
printf("GC needed because JSGC_BYTES - m_LastGCBytes > m_HeapGrowthBytesGCTrigger \n"
|
||||
" JSGC_BYTES: %d KB \n m_LastGCBytes: %d KB \n m_HeapGrowthBytesGCTrigger: %d KB \n",
|
||||
gcBytes / 1024,
|
||||
m_LastGCBytes / 1024,
|
||||
" JSGC_BYTES: %d KB \n m_LastGCBytes: %d KB \n m_HeapGrowthBytesGCTrigger: %d KB \n",
|
||||
gcBytes / 1024,
|
||||
m_LastGCBytes / 1024,
|
||||
m_HeapGrowthBytesGCTrigger / 1024);
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user