From: adash <adash>
Date: Mon, 20 Apr 2009 23:27:00 +0000 (+0000)
Subject:  new Barrier Class
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3982ac500f03e40688041f3fe8f1051748f6a493;p=IRC.git

 new Barrier Class
---

diff --git a/Robust/src/ClassLibrary/JavaSTM/Barrier.java b/Robust/src/ClassLibrary/JavaSTM/Barrier.java
index f8389c47..9ab0cf4b 100644
--- a/Robust/src/ClassLibrary/JavaSTM/Barrier.java
+++ b/Robust/src/ClassLibrary/JavaSTM/Barrier.java
@@ -1,52 +1,10 @@
-public class BarrierServer extends Thread {
-  int numthreads;
-  boolean done;
-
-  public BarrierServer(int n) {
-    numthreads=n;
-    done=false;
-  }
-
-  public void run() {
-    int n;
-    ServerSocket ss=new ServerSocket(2000);
-    atomic {
-      n=numthreads;
-      done=true;
-    }
-    Socket ar[]=new Socket[n];
-    for(int i=0; i<n; i++) {
-      ar[i]=ss.accept();
-    }
-
-    while(true) {
-      for(int j=0; j<n; j++) {
-	Socket s=ar[j];
-	byte b[]=new byte[1];
-	while(s.read(b)!=1) {
-	  ;
-	}
-      }
-      byte b[]=new byte[1];
-      b[0]= (byte) 'A';
-      for(int j=0; j<n; j++)
-	ar[j].write(b);
-    }
-  }
-}
-
 public class Barrier {
-  Socket s;
-  public Barrier(String name) {
-    s=new Socket(name, 2000);
+  public Barrier() {
   }
 
-  public static void enterBarrier(Barrier barr) {
-    byte b[]=new byte[1];
-    b[0]=(byte)'A';
-    barr.s.write(b);
-    while(barr.s.read(b)!=1) {
-      ;
-    }
-  }
+  /* Set the number of threads in a Barrier */
+  public static native void setBarrier(int nthreads);
+
+  /* Wait for a Barrier */
+  public static native void enterBarrier();
 }