Merge pull request #14 from dist-sys/refactor_v0.7.0

Refactor v0.7.0

Author: nabon

README.md

@@ -10,17 +10,17 @@ Below is an execution result sample.
 ```
 -----Publisher-----
 Maximum throughput[msg/s]: 53068
-Average throughput[msg/s]: 49894.57142857143
+Average throughput[msg/s]: 49894.57
 Number of published messages: 349262
-Throughput[msg/s]: 44460, 47558, 52569, 53068, 51041, 51583, 48983
+Per second throughput[msg/s]: 44460, 47558, 52569, 53068, 51041, 51583, 48983
 
 -----Subscriber-----
 Maximum throughput[msg/s]: 53050
-Average throughput[msg/s]: 49891.142857142855
+Average throughput[msg/s]: 49891.14
 Number of received messages: 349238
-Throughput[msg/s]: 44399, 47587, 52566, 53050, 51078, 51575, 48983
+Per second throughput[msg/s]: 44399, 47587, 52566, 53050, 51078, 51575, 48983
 Maximum latency[ms]: 24
-Average latency[ms]: 1.3995584672916463
+Average latency[ms]: 1.39
 ```
 
 MQTTLoader is licensed under the Apache License, Version2.0.

doc/usage_en.md

@@ -48,6 +48,10 @@ For example, the following command uses a public MQTT broker provided by HiveMQ.
 
 `$ ./mqttloader -b tcp://broker.hivemq.com:1883 -p 1 -s 1 -m 10`
 
+**By default, MQTTLoader writes out send/receive records to a file. Long term execution leads to increasing file size.**  
+If you want MQTTLoader not to output the file, you can run it with in-memory mode.  
+For more details, please refer to **4. How to read the results > Send/Receive record file**.
+
 ### Run on multiple machines
 You can run MQTTLoader on multiple machines.  
 

doc/usage_jp.md

@@ -49,6 +49,10 @@ MQTTLoaderの動作を確認するだけなら、パブリックブローカを
 
 `$ ./mqttloader -b tcp://broker.hivemq.com:1883 -p 1 -s 1 -m 10`
 
+**MQTTLoaderは、デフォルトで送受信レコードをファイル出力します。長時間実行した場合、ファイルサイズが大きくなることがありますので、注意してください。**  
+ファイルを出力しないインメモリモードで動かすことも可能です。  
+詳細は **4. 測定結果の見方 > 送受信レコードファイル** を参照してください。
+
 ### 複数台での実行
 複数台のマシン上でMQTTLoaderを動かすこともできます。  
 

src/main/java/mqttloader/Loader.java

@@ -265,8 +265,12 @@ private void prepareClients() {
     private void startMeasurement() {
         // delay: Give ScheduledExecutorService time to setup scheduling.
         long delay = publishers.size();
-        startTime = System.currentTimeMillis() + getOffsetFromNtpServer() + delay;
-        startNanoTime = System.nanoTime() + delay * Constants.MILLISECOND_IN_NANO;
+        long offset = getOffsetFromNtpServer();
+        long currentTime = System.currentTimeMillis();
+        long currentNanoTime = System.nanoTime();
+
+        startTime = currentTime + offset + delay;
+        startNanoTime = currentNanoTime + delay * Constants.MILLISECOND_IN_NANO;
         lastRecvTime = startTime;
 
         for(AbstractClient pub: publishers){
@@ -394,7 +398,7 @@ private void calcResult() {
         }
 
         System.out.println("Maximum latency[ms]: "+maxLt);
-        System.out.println("Average latency[ms]: "+aveLt);
+        System.out.println("Average latency[ms]: "+String.format("%.2f", aveLt));
     }
 
     private void trimTreeMap(TreeMap<Integer, ?> map, int rampup, int rampdown) {
@@ -439,7 +443,7 @@ private void printThroughput(TreeMap<Integer, Integer> throughputs, boolean forP
 
         double aveTh = throughputs.size()>0 ? (double)sumMsg/throughputs.size() : 0;
         System.out.println("Maximum throughput[msg/s]: "+maxTh);
-        System.out.println("Average throughput[msg/s]: "+aveTh);
+        System.out.println("Average throughput[msg/s]: "+String.format("%.2f", aveTh));
         if(forPublisher){
             System.out.println("Number of published messages: "+sumMsg);
         }else{

src/main/java/mqttloader/client/AbstractPublisher.java

@@ -25,7 +25,6 @@
 
 import mqttloader.Loader;
 import mqttloader.Record;
-import mqttloader.Util;
 
 public abstract class AbstractPublisher extends AbstractClient implements Runnable {
     protected final String topic;