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

GC v2 compiles again

Browse source
This commit is contained in:
Andreas Rumpf 2016-05-23 12:53:17 +02:00
commit 9b609b26ca
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/system/gc2.nim
View file

@ -97,6 +97,8 @@ type
additionalRoots: CellSeq # dummy roots for GC_ref/unref additionalRoots: CellSeq # dummy roots for GC_ref/unref
spaceIter: ObjectSpaceIter spaceIter: ObjectSpaceIter
dumpHeapFile: File # File that is used for GC_dumpHeap dumpHeapFile: File # File that is used for GC_dumpHeap
when hasThreadSupport:
toDispose: SharedList[pointer]
var var
gch {.rtlThreadVar.}: GcHeap gch {.rtlThreadVar.}: GcHeap
@ -119,6 +121,8 @@ proc initGC() =
init(gch.decStack) init(gch.decStack)
init(gch.additionalRoots) init(gch.additionalRoots)
init(gch.greyStack) init(gch.greyStack)
when hasThreadSupport:
gch.toDispose = initSharedList[pointer]()
# Which color to use for new objects is tricky: When we're marking, # Which color to use for new objects is tricky: When we're marking,
# they have to be *white* so that everything is marked that is only # they have to be *white* so that everything is marked that is only
@ -800,6 +804,10 @@ proc nimGCvisit(d: pointer, op: int) {.compilerRtl.} =
proc collectZCT(gch: var GcHeap): bool {.benign.} proc collectZCT(gch: var GcHeap): bool {.benign.}
proc collectCycles(gch: var GcHeap): bool = proc collectCycles(gch: var GcHeap): bool =
when hasThreadSupport:
for c in gch.toDispose:
nimGCunref(c)
# 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)