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

bugfix: codegen for promises

Browse source
This commit is contained in:
Araq 2014-06-02 09:13:16 +02:00
commit b78173788d
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/lowerings.nim
View file

@ -205,7 +205,7 @@ proc createNimCreatePromiseCall(prom, threadParam: PNode): PNode =
let castExpr = newNodeIT(nkCast, prom.info, prom.typ) let castExpr = newNodeIT(nkCast, prom.info, prom.typ)
castExpr.add emptyNode castExpr.add emptyNode
castExpr.add callCodeGenProc("nimCreatePromise", threadParam, size) castExpr.add callCodeGenProc("nimCreatePromise", threadParam, size)
result = newFastAsgnStmt(prom, castExpr) result = castExpr
proc createWrapperProc(f: PNode; threadParam, argsParam: PSym; proc createWrapperProc(f: PNode; threadParam, argsParam: PSym;
varSection, call, barrier, prom: PNode; varSection, call, barrier, prom: PNode;
@ -216,9 +216,14 @@ proc createWrapperProc(f: PNode; threadParam, argsParam: PSym;
var threadLocalProm: PSym var threadLocalProm: PSym
if spawnKind == srByVar: if spawnKind == srByVar:
threadLocalProm = addLocalVar(varSection, argsParam.owner, prom.typ, prom) threadLocalProm = addLocalVar(varSection, argsParam.owner, prom.typ, prom)
elif prom != nil:
internalAssert prom.typ.kind == tyGenericInst
threadLocalProm = addLocalVar(varSection, argsParam.owner, prom.typ,
createNimCreatePromiseCall(prom, threadParam.newSymNode))
body.add varSection body.add varSection
if prom != nil and spawnKind != srByVar: if prom != nil and spawnKind != srByVar:
body.add createNimCreatePromiseCall(prom, threadParam.newSymNode) body.add newFastAsgnStmt(prom, threadLocalProm.newSymNode)
if barrier == nil: if barrier == nil:
body.add callCodeGenProc("nimPromiseCreateCondVar", prom) body.add callCodeGenProc("nimPromiseCreateCondVar", prom)
@ -230,10 +235,12 @@ proc createWrapperProc(f: PNode; threadParam, argsParam: PSym;
if fk == promInvalid: if fk == promInvalid:
localError(f.info, "cannot create a promise of type: " & localError(f.info, "cannot create a promise of type: " &
typeToString(prom.typ.sons[1])) typeToString(prom.typ.sons[1]))
body.add newAsgnStmt(indirectAccess(prom, body.add newAsgnStmt(indirectAccess(threadLocalProm.newSymNode,
if fk == promGC: "data" else: "blob", prom.info), call) if fk == promGC: "data" else: "blob", prom.info), call)
if barrier == nil: if barrier == nil:
body.add callCodeGenProc("nimPromiseSignal", prom) # by now 'prom' is shared and thus might have beeen overwritten! we need
# to use the thread-local view instead:
body.add callCodeGenProc("nimPromiseSignal", threadLocalProm.newSymNode)
else: else:
body.add call body.add call
if barrier != nil: if barrier != nil:

2
lib/pure/concurrency/threadpool.nim
View file

@ -151,7 +151,7 @@ proc await*[T](prom: Promise[T]) =
if prom.usesCondVar: await(prom.cv) if prom.usesCondVar: await(prom.cv)
proc awaitAndThen*[T](prom: Promise[T]; action: proc (x: T) {.closure.}) = proc awaitAndThen*[T](prom: Promise[T]; action: proc (x: T) {.closure.}) =
## blocks until the value is available and then passes this value ## blocks until the ``prom`` is available and then passes its value
## to ``action``. Note that due to Nimrod's parameter passing semantics this ## to ``action``. Note that due to Nimrod's parameter passing semantics this
## means that ``T`` doesn't need to be copied and so ``awaitAndThen`` can ## means that ``T`` doesn't need to be copied and so ``awaitAndThen`` can
## sometimes be more efficient than ``^``. ## sometimes be more efficient than ``^``.

1
tests/parallel/nimrod.cfg Normal file
View file

@ -0,0 +1 @@
threads:on