diff options
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/parallel/mutable/ParHashMap.scala | 2 | ||||
-rw-r--r-- | src/library/scala/collection/parallel/mutable/ParHashTable.scala | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala index c87584d81e..7e4e26d758 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala @@ -106,6 +106,8 @@ self => object ParHashMap extends ParMapFactory[ParHashMap] { + var iters = 0 + def empty[K, V]: ParHashMap[K, V] = new ParHashMap[K, V] def newCombiner[K, V]: Combiner[(K, V), ParHashMap[K, V]] = ParHashMapCombiner.apply[K, V] diff --git a/src/library/scala/collection/parallel/mutable/ParHashTable.scala b/src/library/scala/collection/parallel/mutable/ParHashTable.scala index 8f7ff72103..a9ab577b55 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashTable.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashTable.scala @@ -30,9 +30,11 @@ trait ParHashTable[K, Entry >: Null <: HashEntry[K, Entry]] extends collection.m def entry2item(e: Entry): T def newIterator(idxFrom: Int, idxUntil: Int, totalSize: Int, es: Entry): IterRepr - def hasNext = es != null + def hasNext = { + es ne null + } - def next = { + def next: T = { val res = es es = es.next scan() @@ -113,7 +115,9 @@ trait ParHashTable[K, Entry >: Null <: HashEntry[K, Entry]] extends collection.m val fbindex = from / sizeMapBucketSize // find the last bucket - val lbindex = from / sizeMapBucketSize + val lbindex = until / sizeMapBucketSize + // note to self: FYI if you define lbindex as from / sizeMapBucketSize, the first branch + // below always triggers and tests pass, so you spend a great day benchmarking and profiling if (fbindex == lbindex) { // if first and last are the same, just count between `from` and `until` @@ -164,5 +168,7 @@ trait ParHashTable[K, Entry >: Null <: HashEntry[K, Entry]] extends collection.m - +object ParHashTable { + var iters = 0 +} |