From c918954223a2348e95b1ce9829226c308d0a3887 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Wed, 6 Aug 2008 19:13:06 +0000
Subject: [PATCH] change

---
 Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java | 13 ++++++++++++-
 Robust/src/ClassLibrary/Barrier.java               |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
index 1a544402..d54fbd0f 100644
--- a/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
+++ b/Robust/src/Benchmarks/Prefetch/Em3d/dsm/Em3d2.java
@@ -176,6 +176,8 @@ public class Em3d extends Thread {
       mybarr = global new BarrierServer(numThreads);
       graph =  BiGraph.create(em.numNodes, em.numDegree, numThreads);
     }
+    mybarr.start(mid[1]);
+
 
     Em3dWrap[] em3d=new Em3dWrap[numThreads];    
     int increment = em.numNodes/numThreads;
@@ -197,9 +199,18 @@ public class Em3d extends Thread {
       }
     }
 
+    boolean waitfordone=true;
+    while(waitfordone) {
+	atomic {
+	    if (mybarr.done)
+		waitfordone=false;
+	}
+    }
+
+    
+
     //TODO check if correct
     //
-    mybarr.start(mid[1]);
     System.printString("Starting Barrier run\n");
     for(int i = 0; i<numThreads; i++) {
       em3d[i].em3d.start(mid[i]);
diff --git a/Robust/src/ClassLibrary/Barrier.java b/Robust/src/ClassLibrary/Barrier.java
index 3f549f04..c1892564 100644
--- a/Robust/src/ClassLibrary/Barrier.java
+++ b/Robust/src/ClassLibrary/Barrier.java
@@ -1,10 +1,10 @@
 public class BarrierServer extends Thread {
     int numthreads;
-    int done;
+    boolean done;
 
     public BarrierServer(int n) {
 	numthreads=n;
-	done=0;
+	done=false;
     }
     
     public void run() {
@@ -12,7 +12,7 @@ public class BarrierServer extends Thread {
 	ServerSocket ss=new ServerSocket(2000);
 	atomic {
 	    n=numthreads;
-	    done=1;
+	    done=true;
 	}
 	Socket ar[]=new Socket[n];
 	for(int i=0;i<n;i++) {
-- 
2.34.1