Merge branch 'topic/cachetrie-remove' into 'master'

Topic/cachetrie remove

See merge request !62

Author: storm-enroute-bot

.gitignore

@@ -1,20 +1,17 @@
-target
-deploy
-tmp
-
-# ctags stuff
-.tags
-.tags_sorted_by_file
 .flooignore
 .floo
-.sublime-project
-
+tmp
+# deployed docs
+.tags_sorted_by_file
 # idea crap
+target
+*.dmp
+deploy
+apidocs/
+reactors-common/jvm/src/bench/scala/io/reactors/common/concurrent/cache-trie-remove-benches.scala
+.sublime-project
+# ctags stuff
 *.iml
 .idea/
-
 # misc
-*.dmp
-
-# deployed docs
-apidocs/
+.tags

dependencies.conf

@@ -7,7 +7,7 @@ reactors-common-jvm = [
     repo = "scalameter"
     project = "scalameter"
     configuration = "test->test"
-    artifact = ["com.storm-enroute", "scalameter", "0.9-SNAPSHOT", "test;bench"]
+    artifact = ["com.storm-enroute", "scalameter", "0.10-SNAPSHOT", "test;bench"]
   }
 ]
 
@@ -22,7 +22,7 @@ reactors-core-jvm = [
     repo = "scalameter"
     project = "scalameter"
     configuration = "test->test"
-    artifact = ["com.storm-enroute", "scalameter", "0.9-SNAPSHOT", "test;bench"]
+    artifact = ["com.storm-enroute", "scalameter", "0.10-SNAPSHOT", "test;bench"]
   }
 ]
 
@@ -37,7 +37,7 @@ reactors-container-jvm = [
     repo = "scalameter"
     project = "scalameter"
     configuration = "test->test"
-    artifact = ["com.storm-enroute", "scalameter", "0.9-SNAPSHOT", "test;bench"]
+    artifact = ["com.storm-enroute", "scalameter", "0.10-SNAPSHOT", "test;bench"]
   }
 ]
 
@@ -67,7 +67,7 @@ reactors-extra = [
     repo = "scalameter"
     project = "scalameter"
     configuration = "test->test"
-    artifact = ["com.storm-enroute", "scalameter", "0.9-SNAPSHOT", "test;bench"]
+    artifact = ["com.storm-enroute", "scalameter", "0.10-SNAPSHOT", "test;bench"]
   }
 ]
 

reactors-common/jvm/src/bench/scala/io/reactors/common/concurrent/cache-trie-benches.scala

@@ -472,103 +472,6 @@ class CacheTrieBenches extends JBench.OfflineReport {
     // println(xs.debugCacheStats)
     xs
   }
-
-  def chmRefill(sc: (Int, ConcurrentHashMap[Wrapper, Wrapper])): Unit = {
-    val (size, chm) = sc
-    var i = 0
-    while (i < size) {
-      chm.put(elems(i), elems(i))
-      i += 1
-    }
-  }
-
-  def skiplistRefill(sc: (Int, ConcurrentSkipListMap[Wrapper, Wrapper])): Unit = {
-    val (size, skiplist) = sc
-    var i = 0
-    while (i < size) {
-      skiplist.put(elems(i), elems(i))
-      i += 1
-    }
-  }
-
-  def ctrieRefill(sc: (Int, TrieMap[Wrapper, Wrapper])): Unit = {
-    val (size, trie) = sc
-    var i = 0
-    while (i < size) {
-      trie.put(elems(i), elems(i))
-      i += 1
-    }
-  }
-
-  def cachetrieRefill(sc: (Int, CacheTrie[Wrapper, Wrapper])): Unit = {
-    val (size, trie) = sc
-    var i = 0
-    while (i < size) {
-      trie.insert(elems(i), elems(i))
-      i += 1
-    }
-  }
-
-  // @gen("chms")
-  // @benchmark("cache-trie.remove")
-  // @setup("chmRefill")
-  // @curve("CHM")
-  // def chmRemove(sc: (Int, ConcurrentHashMap[Wrapper, Wrapper])): Int = {
-  //   val (size, chm) = sc
-  //   var i = 0
-  //   var sum = 0
-  //   while (i < size) {
-  //     sum += chm.remove(elems(i)).value
-  //     i += 1
-  //   }
-  //   sum
-  // }
-
-  // @gen("skiplists")
-  // @benchmark("cache-trie.remove")
-  // @setup("skiplistRefill")
-  // @curve("skiplist")
-  // def skiplistRemove(sc: (Int, ConcurrentSkipListMap[Wrapper, Wrapper])): Int = {
-  //   val (size, skiplist) = sc
-  //   var i = 0
-  //   var sum = 0
-  //   while (i < size) {
-  //     sum += skiplist.remove(elems(i)).value
-  //     i += 1
-  //   }
-  //   sum
-  // }
-
-  // @gen("ctries")
-  // @benchmark("cache-trie.remove")
-  // @setup("ctrieRefill")
-  // @curve("ctrie")
-  // def ctrieRemove(sc: (Int, TrieMap[Wrapper, Wrapper])): Int = {
-  //   val (size, trie) = sc
-  //   var i = 0
-  //   var sum = 0
-  //   while (i < size) {
-  //     sum += trie.remove(elems(i)).get.value
-  //     i += 1
-  //   }
-  //   sum
-  // }
-
-  // @gen("cachetries")
-  // @benchmark("cache-trie.remove")
-  // @setup("cachetrieRefill")
-  // @curve("cachetrie")
-  // def cachetrieRemove(sc: (Int, CacheTrie[Wrapper, Wrapper])): Int = {
-  //   val (size, trie) = sc
-  //   var i = 0
-  //   var sum = 0
-  //   while (i < size) {
-  //     sum += trie.remove(elems(i)).value
-  //     i += 1
-  //   }
-  //   println(trie.debugCacheStats)
-  //   sum
-  // }
 }