Changes

[iotcloud.git] / version2 / src / java / iotcloud / Test.java

diff --git a/version2/src/java/iotcloud/Test.java b/version2/src/java/iotcloud/Test.java
index 403c2beb368b4645ffa3b8418fab02820ce22996..984b1f10ee533b38724f017c6834dcb2fc19bbba 100644 (file)
--- a/version2/src/java/iotcloud/Test.java
+++ b/version2/src/java/iotcloud/Test.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 
 public class Test {
 
-    public static final  int NUMBER_OF_TESTS = 25;
+    public static final  int NUMBER_OF_TESTS = 1000; 
 
     public static void main(String[] args)  throws ServerException {
         if (args[0].equals("2")) {
@@ -59,6 +59,8 @@ public class Test {
         t1.initTable();
         System.out.println("T1 Ready");
 
+        long initTimeNet = timer.getTime();
+
         // Make the Keys
         System.out.println("Setting up keys");
         startTime = System.nanoTime();
@@ -70,12 +72,15 @@ public class Test {
         }
         endTime = System.nanoTime();
         long keysDt = endTime - startTime;
-        long keysNet = timer.getTime();
+        long keysNet = timer.getTime() - initTimeNet;
 
         System.out.println("Total Key Create Time: " + keysDt / 1000000);
         System.out.println("Total Key Create Time Network: " + keysNet / 1000000);
         System.out.println("Total Key Create Time no Network: " + (keysDt - keysNet) / 1000000);
         System.out.println();
+
+
+        // t1.printSlots();
    }
 
 
@@ -96,6 +101,11 @@ public class Test {
         t2.update();
         System.out.println("T2 Ready");
 
+
+
+        long initTimeNet = timer.getTime();
+
+
         // Make the Keys
         System.out.println("Setting up keys");
         startTime = System.nanoTime();
@@ -116,12 +126,12 @@ public class Test {
         }
         endTime = System.nanoTime();
         long keysDt = endTime - startTime;
-        long keysNet = timer.getTime();
+        long keysNet = timer.getTime() - initTimeNet;
 
         // Do Updates for the keys
         System.out.println("Setting Key-Values...");
         startTime = System.nanoTime();
-        for (int t = 0; t < 3; t++) {
+        for (int t = 0; t < 1; t++) {
             for (int i = 0; i < NUMBER_OF_TESTS; i++) {
                 System.out.println(i);
                 String keyA = "a" + i;
@@ -163,7 +173,7 @@ public class Test {
         }
         endTime = System.nanoTime();
         long writesDt = endTime - startTime;
-        long writesNet = timer.getTime() - keysNet;
+        long writesNet = timer.getTime() - keysNet - initTimeNet;
 
         System.out.println("Updating Clients...");
         startTime = System.nanoTime();
@@ -171,7 +181,7 @@ public class Test {
         t2.update();
         endTime = System.nanoTime();
         long updatesDt = endTime - startTime;
-        long updatesNet = timer.getTime() - keysNet - writesNet;
+        long updatesNet = timer.getTime() - keysNet - writesNet - initTimeNet;
 
 
         System.out.println("Total Key Create Time: " + keysDt / 1000000);
@@ -205,6 +215,10 @@ public class Test {
         t2.update();
         System.out.println("T2 Ready");
 
+
+        long initTimeNet = timer.getTime();
+
+
         // Make the Keys
         System.out.println("Setting up keys");
         startTime = System.nanoTime();
@@ -225,12 +239,12 @@ public class Test {
         }
         endTime = System.nanoTime();
         long keysDt = endTime - startTime;
-        long keysNet = timer.getTime();
+        long keysNet = timer.getTime() - initTimeNet;
 
         // Do Updates for the keys
         System.out.println("Setting Key-Values...");
         startTime = System.nanoTime();
-        for (int t = 0; t < 3; t++) {
+        for (int t = 0; t < 1; t++) {
             for (int i = 0; i < NUMBER_OF_TESTS; i++) {
                 System.out.println(i);
                 String keyA = "a" + i;
@@ -272,7 +286,7 @@ public class Test {
         }
         endTime = System.nanoTime();
         long writesDt = endTime - startTime;
-        long writesNet = timer.getTime() - keysNet;
+        long writesNet = timer.getTime() - keysNet - initTimeNet;
 
         System.out.println("Updating Clients...");
         startTime = System.nanoTime();
@@ -280,7 +294,7 @@ public class Test {
         t2.update();
         endTime = System.nanoTime();
         long updatesDt = endTime - startTime;
-        long updatesNet = timer.getTime() - keysNet - writesNet;
+        long updatesNet = timer.getTime() - keysNet - writesNet - initTimeNet;
 
 
         System.out.println("Total Key Create Time: " + keysDt / 1000000);