diff options
| -rw-r--r-- | lib/system/gc2.nim | 16 | ||||
| -rw-r--r-- | lib/system/mmdisp.nim | 4 | ||||
| -rw-r--r-- | todo.txt | 3 |
3 files changed, 15 insertions, 8 deletions
diff --git a/lib/system/gc2.nim b/lib/system/gc2.nim index e68a8586e..6b6b81824 100644 --- a/lib/system/gc2.nim +++ b/lib/system/gc2.nim @@ -104,8 +104,6 @@ when not defined(useNimRtl): proc initGC() = when not defined(useNimRtl): - when traceGC: - for i in low(CellState)..high(CellState): init(states[i]) gch.cycleThreshold = InitialCycleThreshold gch.stat.stackScans = 0 gch.stat.cycleCollections = 0 @@ -168,8 +166,10 @@ proc writeCell(msg: cstring, c: PCell) = c_fprintf(c_stdout, "[GC] %s: %p %d rc=%ld; color=%ld\n", msg, c, kind, c.refcount shr rcShift, c.color) +proc myastToStr[T](x: T): string {.magic: "AstToStr", noSideEffect.} + template gcTrace(cell, state: expr): stmt {.immediate.} = - when traceGC: traceCell(cell, state) + when traceGC: writeCell(myastToStr(state), cell) # forward declarations: proc collectCT(gch: var GcHeap) {.benign.} @@ -568,7 +568,7 @@ template takeTime {.dirty.} = template checkTime {.dirty.} = if debugticker <= 0: - echo "in loop" + #echo "in loop" debugticker = 1000 when withRealTime: if steps == 0: @@ -602,8 +602,9 @@ proc freeCyclicCell(gch: var GcHeap, c: PCell) = proc sweep(gch: var GcHeap): bool = takeStartTime(100) - echo "loop start" + #echo "loop start" let black = gch.black + cfprintf(cstdout, "black is %d\n", black) while true: let x = allObjectsAsProc(gch.region, addr gch.spaceIter) if gch.spaceIter.state < 0: break @@ -619,7 +620,7 @@ proc sweep(gch: var GcHeap): bool = # traversal over the heap! checkTime() # prepare for next iteration: - echo "loop end" + #echo "loop end" gch.spaceIter = ObjectSpaceIter() result = true @@ -634,6 +635,9 @@ proc markIncremental(gch: var GcHeap): bool = takeStartTime(100) while L[] > 0: var c = gch.greyStack.d[0] + if not isAllocatedPtr(gch.region, c): + c_fprintf(c_stdout, "[GC] not allocated anymore: %p\n", c) + sysAssert(isAllocatedPtr(gch.region, c), "markIncremental: isAllocatedPtr") gch.greyStack.d[0] = gch.greyStack.d[L[] - 1] dec(L[]) diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim index 1c13f3ff8..2e0fecd49 100644 --- a/lib/system/mmdisp.nim +++ b/lib/system/mmdisp.nim @@ -16,8 +16,8 @@ const debugGC = false # we wish to debug the GC... logGC = false - traceGC = false # extensive debugging - alwaysCycleGC = false + traceGC = defined(smokeCycles) # extensive debugging + alwaysCycleGC = defined(smokeCycles) alwaysGC = defined(fulldebug) # collect after every memory # allocation (for debugging) leakDetector = false diff --git a/todo.txt b/todo.txt index 6c1c602f5..703139c9c 100644 --- a/todo.txt +++ b/todo.txt @@ -1,3 +1,6 @@ + +nim c --gc:v2 -r -d:useSysAssert -d:useGcAssert -d:smokeCycles -d:useRealtimeGc tests/gc/gcbench + essential for 1.0 ================= |