jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only mark roots when marking

Browse source
This commit is contained in:
Araq 2015-11-30 07:44:32 +01:00
commit 9ed635d5c0
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/system/gc2.nim
View file

@ -604,6 +604,7 @@ proc sweep(gch: var GcHeap): bool =
if isCell(x): if isCell(x):
# cast to PCell is correct here: # cast to PCell is correct here:
var c = cast[PCell](x) var c = cast[PCell](x)
gcAssert c.color != rcGrey, "cell is still grey?"
if c.color == rcWhite: freeCyclicCell(gch, c) if c.color == rcWhite: freeCyclicCell(gch, c)
else: c.setColor(rcWhite) else: c.setColor(rcWhite)
checkTime() checkTime()
@ -613,7 +614,7 @@ proc sweep(gch: var GcHeap): bool =
result = true result = true
proc markS(gch: var GcHeap, c: PCell) = proc markS(gch: var GcHeap, c: PCell) =
if c.color != rcGrey: if c.color == rcWhite:
c.setColor(rcGrey) c.setColor(rcGrey)
add(gch.greyStack, c) add(gch.greyStack, c)
#forAllChildren(c, waMarkGrey) #forAllChildren(c, waMarkGrey)
@ -690,7 +691,7 @@ proc doOperation(p: pointer, op: WalkOp) =
else: else:
markS(gch, c) markS(gch, c)
of waMarkGrey: of waMarkGrey:
if c.color != rcBlack: if c.color == rcWhite:
c.setColor(rcGrey) c.setColor(rcGrey)
add(gch.greyStack, c) add(gch.greyStack, c)
#of waDebug: debugGraph(c) #of waDebug: debugGraph(c)
@ -703,10 +704,10 @@ proc collectZCT(gch: var GcHeap): bool {.benign.}
proc collectCycles(gch: var GcHeap): bool = proc collectCycles(gch: var GcHeap): bool =
# ensure the ZCT 'color' is not used: # ensure the ZCT 'color' is not used:
while gch.zct.len > 0: discard collectZCT(gch) while gch.zct.len > 0: discard collectZCT(gch)
markGlobals(gch)
markLocals(gch)
case gch.phase case gch.phase
of Phase.None, Phase.Marking: of Phase.None, Phase.Marking:
markGlobals(gch)
markLocals(gch)
gch.phase = Phase.Marking gch.phase = Phase.Marking
if markIncremental(gch): if markIncremental(gch):
gch.phase = Phase.Sweeping gch.phase = Phase.Sweeping