corrected updateroot gc offline write/read timing

ObliVMGC/com/oblivm/backend/gc/regular/GCEva.java

@@ -6,6 +6,8 @@ import com.oblivm.backend.gc.GCEvaComp;
 import com.oblivm.backend.gc.GCSignal;
 import com.oblivm.backend.network.Network;
 
+import util.Timer;
+
 public class GCEva extends GCEvaComp {
 	Garbler gb;
 	GCSignal[][] gtt = new GCSignal[2][2];
@@ -14,6 +16,10 @@ public class GCEva extends GCEvaComp {
 	GCEva next = null;
 	GCEva curr = null;
 
+	Timer timer = null;
+	int p;
+	int m;
+
 	public GCEva(Network channel) {
 		super(channel, Mode.REAL);
 		gb = new Garbler();
@@ -23,6 +29,19 @@ public class GCEva extends GCEvaComp {
 		gtt[1][1] = GCSignal.newInstance(new byte[10]);
 	}
 
+	public GCEva(Network channel, Timer timer, int p, int m) {
+		super(channel, Mode.REAL);
+		gb = new Garbler();
+		gtt[0][0] = GCSignal.ZERO;
+		gtt[0][1] = GCSignal.newInstance(new byte[10]);
+		gtt[1][0] = GCSignal.newInstance(new byte[10]);
+		gtt[1][1] = GCSignal.newInstance(new byte[10]);
+
+		this.timer = timer;
+		this.p = p;
+		this.m = m;
+	}
+
 	public void setEvaluate() {
 		evaluate = true;
 		curr = this;
@@ -30,6 +49,9 @@ public class GCEva extends GCEvaComp {
 
 	private void receiveGTT() {
 		try {
+			if (timer != null)
+				timer.start(p, m);
+
 			Flag.sw.startGCIO();
 			GCSignal.receive(channel, gtt[0][1]);
 			GCSignal.receive(channel, gtt[1][0]);
@@ -37,6 +59,9 @@ public class GCEva extends GCEvaComp {
 			// gtt[1][0] = GCSignal.receive(channel);
 			// gtt[1][1] = GCSignal.receive(channel);
 			Flag.sw.stopGCIO();
+
+			if (timer != null)
+				timer.stop(p, m);
 		} catch (Exception e) {
 			e.printStackTrace();
 			System.exit(1);

ObliVMGC/com/oblivm/backend/gc/regular/GCGen.java

@@ -6,9 +6,15 @@ import com.oblivm.backend.gc.GCGenComp;
 import com.oblivm.backend.gc.GCSignal;
 import com.oblivm.backend.network.Network;
 
+import util.Timer;
+
 public class GCGen extends GCGenComp {
 	Garbler gb;
 
+	Timer timer = null;
+	int p;
+	int m;
+
 	public GCGen(Network channel) {
 		super(channel, Mode.REAL);
 		gb = new Garbler();
@@ -21,6 +27,22 @@ public class GCGen extends GCGenComp {
 		}
 	}
 
+	public GCGen(Network channel, Timer timer, int p, int m) {
+		super(channel, Mode.REAL);
+		gb = new Garbler();
+		for (int i = 0; i < 2; ++i) {
+			labelL[i] = new GCSignal(new byte[10]);
+			labelR[i] = new GCSignal(new byte[10]);
+			lb[i] = new GCSignal(new byte[10]);
+			toSend[0][i] = new GCSignal(new byte[10]);
+			toSend[1][i] = new GCSignal(new byte[10]);
+		}
+
+		this.timer = timer;
+		this.p = p;
+		this.m = m;
+	}
+
 	private GCSignal[][] gtt = new GCSignal[2][2];
 	private GCSignal[][] toSend = new GCSignal[2][2];
 	private GCSignal labelL[] = new GCSignal[2];
@@ -58,11 +80,17 @@ public class GCGen extends GCGenComp {
 
 	private void sendGTT() {
 		try {
+			if (timer != null)
+				timer.start(p, m);
+
 			Flag.sw.startGCIO();
 			toSend[0][1].send(channel);
 			toSend[1][0].send(channel);
 			toSend[1][1].send(channel);
 			Flag.sw.stopGCIO();
+
+			if (timer != null)
+				timer.stop(p, m);
 		} catch (Exception e) {
 			e.printStackTrace();
 			System.exit(1);

src/protocols/precomputation/PreUpdateRoot.java

@@ -49,7 +49,7 @@ public class PreUpdateRoot extends Protocol {
 		}
 
 		Network channel = new Network(null, con1);
-		CompEnv<GCSignal> gen = new GCGen(channel);
+		CompEnv<GCSignal> gen = new GCGen(channel, timer, P.UR, M.offline_write);
 		GCSignal[][] outZeroKeys = new GCUpdateRoot<GCSignal>(gen, lBits + 1, sw).rootFindDeepestAndEmpty(j1ZeroKeys,
 				LiZeroKeys, E_feZeroKeys, C_feZeroKeys, E_labelZeroKeys, C_labelZeroKeys);
 
@@ -85,7 +85,7 @@ public class PreUpdateRoot extends Protocol {
 		}
 
 		Network channel = new Network(con1, null);
-		CompEnv<GCSignal> eva = new GCEva(channel);
+		CompEnv<GCSignal> eva = new GCEva(channel, timer, P.UR, M.offline_read);
 		predata.ur_gcur = new GCUpdateRoot<GCSignal>(eva, lBits + 1, sw);
 		predata.ur_gcur.rootFindDeepestAndEmpty(j1ZeroKeys, LiZeroKeys, E_feZeroKeys, C_feZeroKeys, E_labelZeroKeys,
 				C_labelZeroKeys);