wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1108836 - Fix race condition starting background sweeping r=terrence

Browse Source
This commit is contained in:
Jon Coppeard 2014-12-11 11:19:56 +00:00
parent d108e9157c
commit 7f3d23f2fe
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/gc/Zone.cpp
View File

@ -289,7 +289,7 @@ ZoneList::ZoneList()
ZoneList::ZoneList(Zone *zone)
: head(zone), tail(zone)
{
MOZ_ASSERT(!zone->isOnList());
MOZ_RELEASE_ASSERT(!zone->isOnList());
zone->listNext_ = nullptr;
}
@ -333,7 +333,6 @@ ZoneList::front() const
void
ZoneList::append(Zone *zone)
{
MOZ_ASSERT(!zone->isOnList());
ZoneList singleZone(zone);
transferFrom(singleZone);
}

9
js/src/jit-test/tests/gc/bug-1108836.js Normal file
View File

@ -0,0 +1,9 @@
const root = newGlobal();
var g = newGlobal();
for (var indexI = 0; indexI <= 65535; indexI++) {
eval("/*var " + String.fromCharCode(indexI) + "xx = 1*/");
}
for (var i = 0; i < 100; ++i) {
gc();
gcslice(1000000);
}

39
js/src/jsgc.cpp
View File

@ -3641,8 +3641,6 @@ GCHelperState::maybeStartBackgroundSweep(const AutoLockGC &lock)
{
MOZ_ASSERT(CanUseExtraThreads());
sweepFlag = true;
shrinkFlag = false;
if (state() == IDLE)
startBackgroundThread(SWEEPING);
}
@ -3653,7 +3651,6 @@ GCHelperState::startBackgroundShrink(const AutoLockGC &lock)
MOZ_ASSERT(CanUseExtraThreads());
switch (state()) {
case IDLE:
MOZ_ASSERT(!sweepFlag);
shrinkFlag = true;
startBackgroundThread(SWEEPING);
break;
@ -3678,30 +3675,26 @@ GCHelperState::waitBackgroundSweepEnd()
void
GCHelperState::doSweep(AutoLockGC &lock)
{
while (sweepFlag) {
sweepFlag = false;
ZoneList zones;
zones.transferFrom(rt->gc.backgroundSweepZones);
LifoAlloc freeLifoAlloc(JSRuntime::TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE);
freeLifoAlloc.transferFrom(&rt->gc.freeLifoAlloc);
AutoUnlockGC unlock(lock);
// The main thread may call queueZonesForBackgroundSweep() or
// ShrinkGCBuffers() while this is running so we must check there is no more
// work to do before exiting.
rt->gc.sweepBackgroundThings(zones, BackgroundThread);
freeLifoAlloc.freeAll();
}
do {
while (!rt->gc.backgroundSweepZones.isEmpty()) {
ZoneList zones;
zones.transferFrom(rt->gc.backgroundSweepZones);
LifoAlloc freeLifoAlloc(JSRuntime::TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE);
freeLifoAlloc.transferFrom(&rt->gc.freeLifoAlloc);
AutoUnlockGC unlock(lock);
bool shrinking = shrinkFlag;
rt->gc.expireChunksAndArenas(shrinking, lock);
rt->gc.sweepBackgroundThings(zones, BackgroundThread);
freeLifoAlloc.freeAll();
}
/*
* The main thread may have called ShrinkGCBuffers while
* ExpireChunksAndArenas(rt, false) was running, so we recheck the flag
* afterwards.
*/
if (!shrinking && shrinkFlag) {
bool shrinking = shrinkFlag;
shrinkFlag = false;
rt->gc.expireChunksAndArenas(true, lock);
}
rt->gc.expireChunksAndArenas(shrinking, lock);
} while (!rt->gc.backgroundSweepZones.isEmpty() || shrinkFlag);
}
bool

4
js/src/jsgc.h
View File

@ -1008,8 +1008,7 @@ class GCHelperState
State state();
void setState(State state);
bool sweepFlag;
bool shrinkFlag;
bool shrinkFlag;
friend class js::gc::ArenaLists;
@ -1028,7 +1027,6 @@ class GCHelperState
done(nullptr),
state_(IDLE),
thread(nullptr),
sweepFlag(false),
shrinkFlag(false)
{ }