From 7b97855a3bea4cbb7bfbf5894c388f3e6970c671 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Wed, 21 Dec 2016 21:48:53 +0100
Subject: [PATCH] Moved fuse benchmark into separate dir

---
 .../benchmark/{ => fuse_benchmarker}/BenchmarkPublisher.groovy | 3 ++-
 .../{ => fuse_benchmarker}/BenchmarkSubscriber.groovy          | 1 +
 .../{ => fuse_benchmarker}/fuse_asynch_benchmarker.groovy      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename tools_scripts/benchmark/{ => fuse_benchmarker}/BenchmarkPublisher.groovy (97%)
 rename tools_scripts/benchmark/{ => fuse_benchmarker}/BenchmarkSubscriber.groovy (99%)
 rename tools_scripts/benchmark/{ => fuse_benchmarker}/fuse_asynch_benchmarker.groovy (99%)

diff --git a/tools_scripts/benchmark/BenchmarkPublisher.groovy b/tools_scripts/benchmark/fuse_benchmarker/BenchmarkPublisher.groovy
similarity index 97%
rename from tools_scripts/benchmark/BenchmarkPublisher.groovy
rename to tools_scripts/benchmark/fuse_benchmarker/BenchmarkPublisher.groovy
index 2a41e57c..4a63a7e3 100644
--- a/tools_scripts/benchmark/BenchmarkPublisher.groovy
+++ b/tools_scripts/benchmark/fuse_benchmarker/BenchmarkPublisher.groovy
@@ -81,7 +81,7 @@ class BenchmarkPublisher {
 
             // Once we connect..
             public void onSuccess(Void v) {
-                println "PUB: Succesfully connected to server"
+                println "PUB: Successfully connected to server"
             }
         })
         this.m_latch = new CountDownLatch(1)
@@ -105,6 +105,7 @@ class BenchmarkPublisher {
                     long nanos = System.nanoTime()
                     byte[] message = "Hello world!!-${nanos}".bytes
                     connection.publish("/topic" + dialog_id, message, qos, retain, pubCallback)
+                    print ".\n"
                 }
             })
             timer.sleep(pauseMicroseconds)
diff --git a/tools_scripts/benchmark/BenchmarkSubscriber.groovy b/tools_scripts/benchmark/fuse_benchmarker/BenchmarkSubscriber.groovy
similarity index 99%
rename from tools_scripts/benchmark/BenchmarkSubscriber.groovy
rename to tools_scripts/benchmark/fuse_benchmarker/BenchmarkSubscriber.groovy
index 79194e4b..c1d145ac 100644
--- a/tools_scripts/benchmark/BenchmarkSubscriber.groovy
+++ b/tools_scripts/benchmark/fuse_benchmarker/BenchmarkSubscriber.groovy
@@ -69,6 +69,7 @@ class BenchmarkSubscriber {
                     long sentTime = message.split('-')[1] as long
                     long delay = System.nanoTime() - sentTime
                     histogram.recordValue(delay)
+                    print '+'
                     numReceived++
 //        if ((numReceived % 10000) == 0) {
 //            print '.'
diff --git a/tools_scripts/benchmark/fuse_asynch_benchmarker.groovy b/tools_scripts/benchmark/fuse_benchmarker/fuse_asynch_benchmarker.groovy
similarity index 99%
rename from tools_scripts/benchmark/fuse_asynch_benchmarker.groovy
rename to tools_scripts/benchmark/fuse_benchmarker/fuse_asynch_benchmarker.groovy
index e1be182c..cfbaf850 100644
--- a/tools_scripts/benchmark/fuse_asynch_benchmarker.groovy
+++ b/tools_scripts/benchmark/fuse_benchmarker/fuse_asynch_benchmarker.groovy
@@ -1,4 +1,4 @@
-@Grab(group='org.fusesource.mqtt-client', module='mqtt-client', version='1.10')
+@Grab(group='org.fusesource.mqtt-client', module='mqtt-client', version='1.14')
 @Grab(group='org.eclipse.jetty.toolchain', module='jetty-perf-helper', version='1.0.5')
 
 import java.net.URISyntaxException