mirror of
https://github.com/nim-lang/Nim.git
synced 2026-06-06 20:04:18 +00:00
fixes exhaustion bug and missing GC_ref code generation
This commit is contained in:
@@ -286,6 +286,12 @@ proc createWrapperProc(f: PNode; threadParam, argsParam: PSym;
|
||||
typeToString(fv.typ.sons[1]))
|
||||
body.add newAsgnStmt(indirectAccess(threadLocalProm.newSymNode,
|
||||
if fk == fvGC: "data" else: "blob", fv.info), call)
|
||||
if fk == fvGC:
|
||||
let incRefCall = newNodeI(nkCall, fv.info, 2)
|
||||
incRefCall.sons[0] = newSymNode(createMagic("GCref", mGCref))
|
||||
incRefCall.sons[1] = indirectAccess(threadLocalProm.newSymNode,
|
||||
"data", fv.info)
|
||||
body.add incRefCall
|
||||
if barrier == nil:
|
||||
# by now 'fv' is shared and thus might have beeen overwritten! we need
|
||||
# to use the thread-local view instead:
|
||||
|
||||
@@ -100,7 +100,8 @@ type
|
||||
# for 'awaitAny' support
|
||||
ai: ptr AwaitInfo
|
||||
idx: int
|
||||
data: RootRef # we incRef and unref it to keep it alive
|
||||
data: pointer # we incRef and unref it to keep it alive; note this MUST NOT
|
||||
# be RootRef here otherwise the wrong GC keeps track of it!
|
||||
owner: pointer # ptr Worker
|
||||
|
||||
FlowVarObj[T] = object of FlowVarBaseObj
|
||||
@@ -162,10 +163,8 @@ proc finished(fv: FlowVarBase) =
|
||||
var waited = false
|
||||
acquire(q.lock)
|
||||
while not (q.len < q.data.len):
|
||||
echo "EXHAUSTED!"
|
||||
release(q.lock)
|
||||
#echo "EXHAUSTED!"
|
||||
wakeupWorkerToProcessQueue(owner)
|
||||
acquire(q.lock)
|
||||
wait(q.empty, q.lock)
|
||||
waited = true
|
||||
q.data[q.len] = cast[pointer](fv.data)
|
||||
@@ -180,7 +179,7 @@ proc cleanFlowVars(w: ptr Worker) =
|
||||
acquire(q.lock)
|
||||
for i in 0 .. <q.len:
|
||||
GC_unref(cast[RootRef](q.data[i]))
|
||||
echo "GC_unref"
|
||||
#echo "GC_unref"
|
||||
q.len = 0
|
||||
release(q.lock)
|
||||
signal(q.empty)
|
||||
|
||||
Reference in New Issue
Block a user