From: Ali Younis <ayounis@uci.edu>
Date: Tue, 16 May 2017 03:05:06 +0000 (-0700)
Subject: Changes
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=22cece939162b411a26e7cdb5ac74eefdee6e75b

Changes
---

diff --git a/version2/src/java/iotcloud/Table.java b/version2/src/java/iotcloud/Table.java
index 6348ccc..6a00f82 100644
--- a/version2/src/java/iotcloud/Table.java
+++ b/version2/src/java/iotcloud/Table.java
@@ -166,6 +166,9 @@ final public class Table {
 
 		int livec = 0;
 		int deadc = 0;
+
+		int casdasd = 0;
+
 		for (long i = o; i < (n + 1); i++) {
 			Slot s = buffer.getSlot(i);
 
@@ -174,6 +177,17 @@ final public class Table {
 			for (Entry e : entries) {
 				if (e.isLive()) {
 					int type = e.getType();
+
+
+					if(type == 6)
+					{
+						RejectedMessage rej = (RejectedMessage)e;
+						casdasd++;
+
+						System.out.println(rej.getMachineID());
+					}
+
+
 					types[type] = types[type] + 1;
 					num++;
 					livec++;
@@ -244,6 +258,9 @@ final public class Table {
 		// Just pull the latest slots from the server
 		Slot[] newslots = cloud.getSlots(sequenceNumber + 1);
 		validateAndUpdate(newslots, true);
+		sendToServer(null);
+					updateLiveTransactionsAndStatus();
+
 	}
 
 	// public String toString() {
diff --git a/version2/src/java/light_fan_embed_benchmark/LightsController.java b/version2/src/java/light_fan_embed_benchmark/LightsController.java
index f810cf5..19c1f72 100644
--- a/version2/src/java/light_fan_embed_benchmark/LightsController.java
+++ b/version2/src/java/light_fan_embed_benchmark/LightsController.java
@@ -104,8 +104,10 @@ class LightsController {
                 t1.commitTransaction();
 
 
-                t1.update();
-                Thread.sleep(1000);
+                
+
+                
+                
 
                 for (int i = 0; i < 3; i++) {
                     IoTString testValA1 = t1.getCommitted(keys.get(i));
@@ -116,7 +118,7 @@ class LightsController {
                     }
                 }
 
-                
+                Thread.sleep(1000);
 
             } catch (Error e) {
 
diff --git a/version2/src/java/light_fan_embed_benchmark/Setup.java b/version2/src/java/light_fan_embed_benchmark/Setup.java
index ab6a231..1fb86c8 100644
--- a/version2/src/java/light_fan_embed_benchmark/Setup.java
+++ b/version2/src/java/light_fan_embed_benchmark/Setup.java
@@ -5,7 +5,7 @@ class Setup {
 
     public static void main(String[] args) throws Exception {
 
-        Table t1 = new Table("http://dc-6.calit2.uci.edu/test.iotcloud/", "reallysecret", 300, -1);
+        Table t1 = new Table("http://dc-6.calit2.uci.edu/test.iotcloud/", "reallysecret", 321, -1);
         t1.initTable();