From f5e5c6099796ea6d299d91273fde4c8b1bc06d8a Mon Sep 17 00:00:00 2001
From: Jorge Vicente Cantero <jorgevc@fastmail.es>
Date: Wed, 12 Sep 2018 19:51:55 +0200
Subject: [PATCH] Upgrade benchmark-bridge to fix bug

---
 benchmark-bridge      |  2 +-
 bin/run-benchmarks.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/benchmark-bridge b/benchmark-bridge
index 4b5ad95fe3..0d7a134e78 160000
--- a/benchmark-bridge
+++ b/benchmark-bridge
@@ -1 +1 @@
-Subproject commit 4b5ad95fe30311c2ec1ddc504dd2968402b17618
+Subproject commit 0d7a134e78be01ba5274e93ae3a7416c2c4a5022
diff --git a/bin/run-benchmarks.sh b/bin/run-benchmarks.sh
index ac73c904bd..646da0336f 100755
--- a/bin/run-benchmarks.sh
+++ b/bin/run-benchmarks.sh
@@ -65,7 +65,7 @@ main() {
     echo "Setting up the machine before benchmarks..."
     /bin/bash "$BLOOP_HOME/benchmark-bridge/scripts/benv" set -nb -ns -nf -nl -ni || exit 1
 
-    SBT_COMMANDS="$SBT_COMMANDS;integrationSetUpBloop"
+    SBT_COMMANDS="$SBT_COMMANDS \"integrationSetUpBloop\""
 
     SCALAC_SBT_BLOOP_BENCHMARKS=(
       #"$BLOOP_LARGE_JMH_OPTIONS -p project=scala -p projectName=library"
@@ -73,7 +73,7 @@ main() {
     )
 
     for benchmark in "${SCALAC_SBT_BLOOP_BENCHMARKS[@]}"; do
-        SBT_COMMANDS="$SBT_COMMANDS;$JMH_CMD .*Hot.*Benchmark.* $benchmark"
+        SBT_COMMANDS="$SBT_COMMANDS \"$JMH_CMD .*Hot.*Benchmark.* $benchmark\""
     done
 
     SBT_BLOOP_BENCHMARKS=(
@@ -94,19 +94,19 @@ main() {
       "/usr/lib/jvm/java-8-graal-ee/bin/java"
     )
 
-    ASYNC_PROF_OPTS="-prof jmh.extras.Async:asyncProfilerDir=/repos/async-profiler;flameGraphDir=/repos/FlameGraph;flameGraphOpts=--minwidth,2;verbose=true"
+    ASYNC_PROF_OPTS="-prof jmh.extras.Async:asyncProfilerDir=/repos/async-profiler;flameGraphDir=/repos/FlameGraph;verbose=true;event=cpu;"
     for benchmark in "${SBT_BLOOP_BENCHMARKS[@]}"; do
-      SBT_COMMANDS="$SBT_COMMANDS;$JMH_CMD .*HotBloopBenchmark.* $benchmark $ASYNC_PROF_OPTS"
-      #SBT_COMMANDS="$SBT_COMMANDS;$JMH_CMD .*Hot(Sbt|Bloop)Benchmark.* $benchmark"
+      SBT_COMMANDS="$SBT_COMMANDS \"$JMH_CMD .*HotBloopBenchmark.* $benchmark $ASYNC_PROF_OPTS\""
+      #SBT_COMMANDS="$SBT_COMMANDS \"$JMH_CMD .*Hot(Sbt|Bloop)Benchmark.* $benchmark\""
 
       #for java_home in "${JAVA_HOMES[@]}"; do
-      #  SBT_COMMANDS="$SBT_COMMANDS;$JMH_CMD .*HotBloopBenchmark.* $benchmark -jvm $java_home"
+      #  SBT_COMMANDS="$SBT_COMMANDS \"$JMH_CMD .*HotBloopBenchmark.* $benchmark -jvm $java_home\""
       #done
     done
 
     #BLOOP_BENCHMARKS=("$BLOOP_SMALL_JMH_OPTIONS bloop.ProjectBenchmark")
     #for benchmark in "${BLOOP_BENCHMARKS[@]}"; do
-    #    SBT_COMMANDS="$SBT_COMMANDS;$JMH_CMD $benchmark"
+    #    SBT_COMMANDS="$SBT_COMMANDS \"$JMH_CMD $benchmark\""
     #done
 
     TARGET_LOG_FILE="$BLOOP_LOGS_DIR/benchmarks-$(date --iso-8601=seconds).log"