diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-20 20:19:43 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-20 20:19:43 +0000 |
| commit | eeb70cd5f422e51d2be0658c4ad0b9e7f3d7b4fb (patch) | |
| tree | cd9d135f97ec3dc433287ef99fa57b7e31d17925 /src/library/scala/collection/parallel/mutable/ParArray.scala | |
| parent | 2014160121a62681bdc0e873a3f7e9b5e3bbae16 (diff) | |
| download | scala-eeb70cd5f422e51d2be0658c4ad0b9e7f3d7b4fb.tar.gz scala-eeb70cd5f422e51d2be0658c4ad0b9e7f3d7b4fb.tar.bz2 scala-eeb70cd5f422e51d2be0658c4ad0b9e7f3d7b4fb.zip | |
Refactoring certain tasks to accept empty split...
Refactoring certain tasks to accept empty splitters. Adding parallel
mutable hash maps. No review
Diffstat (limited to 'src/library/scala/collection/parallel/mutable/ParArray.scala')
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParArray.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index d2123a402f..0ca6858fb2 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -541,7 +541,7 @@ extends ParSeq[T] val targetarr = targarrseq.array.asInstanceOf[Array[Any]] // fill it in parallel - executeAndWait(new Map[S](f, targetarr, 0, length)) + executeAndWaitResult(new Map[S](f, targetarr, 0, length)) // wrap it into a parallel array (new ParArray[S](targarrseq)).asInstanceOf[That] @@ -554,7 +554,7 @@ extends ParSeq[T] targetarr(0) = z // do a parallel prefix scan - executeAndWait(new BuildScanTree[U, Any](z, op, 1, size, targetarr, parallelIterator) mapResult { st => + executeAndWaitResult(new BuildScanTree[U, Any](z, op, 1, size, targetarr, parallelIterator) mapResult { st => // println("-----------------------") // println(targetarr.toList) // st.printTree |