From: bdemsky <bdemsky>
Date: Mon, 14 Apr 2008 22:49:45 +0000 (+0000)
Subject: Add join stuff
X-Git-Tag: preEdgeChange~163
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3909d99a964206355010aea86cc9d56a8d903cfe;p=IRC.git

Add join stuff
---

diff --git a/Robust/src/ClassLibrary/Thread.java b/Robust/src/ClassLibrary/Thread.java
index 37278c68..727c986d 100644
--- a/Robust/src/ClassLibrary/Thread.java
+++ b/Robust/src/ClassLibrary/Thread.java
@@ -1,5 +1,5 @@
 public class Thread {
-    private int threadid;
+    private boolean finished;
 
     public void start() {
 	nativeCreate();
@@ -10,6 +10,7 @@ public class Thread {
     }
 
     public void join() {
+	nativeJoin();
     }
 
     private native void nativeJoin();
diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index 93e827aa..655a883b 100644
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -16,6 +16,9 @@ pthread_mutex_t gclistlock;
 pthread_cond_t gccond;
 pthread_mutex_t objlock;
 pthread_cond_t objcond;
+
+pthread_mutex_t joinlock;
+pthread_cond_t joincond;
 pthread_key_t threadlocks;
 pthread_mutex_t threadnotifylock;
 pthread_cond_t threadnotifycond;
@@ -81,6 +84,8 @@ void initializethreads() {
   pthread_cond_init(&gccond, NULL);
   pthread_mutex_init(&objlock,NULL);
   pthread_cond_init(&objcond,NULL);
+  pthread_mutex_init(&joinlock,NULL);
+  pthread_cond_init(&joincond,NULL);
   pthread_key_create(&threadlocks, NULL);
   processOptions();
   initializeexithandler();
@@ -99,11 +104,17 @@ void initializethreads() {
 #ifdef THREADS
 void initthread(struct ___Thread___ * ___this___) {
 #ifdef PRECISE_GC
-  struct ___Thread______staticStart____L___Thread____params p={1, NULL, ___this___};
-  ___Thread______staticStart____L___Thread___(&p);
+  int p[]={1, (int) NULL, (int) ___this___};
+  ___Thread______staticStart____L___Thread___((struct ___Thread______staticStart____L___Thread____params *)p);
+  ___this___=(struct ___Thread___ *) p[2];
 #else
   ___Thread______staticStart____L___Thread___(___this___);
 #endif
+  ___this___->___finished___=1;
+  pthread_mutex_lock(&joinlock);
+  pthread_cond_signal(&joincond);
+  pthread_mutex_unlock(&joinlock);
+
   pthread_mutex_lock(&gclistlock);
   threadcount--;
   pthread_cond_signal(&gccond);
@@ -176,8 +187,10 @@ transstart:
 
 #ifdef THREADS
 void CALL01(___Thread______nativeJoin____, struct ___Thread___ * ___this___) {
-  /* This is an evil, non portable hack*/
-  pthread_join((pthread_t)VAR(___this___)->___threadid___, NULL);
+  pthread_mutex_lock(&joinlock);
+  while(!VAR(___this___)->___finished___)
+    pthread_cond_wait(&joincond, &joinlock);
+  pthread_mutex_unlock(&joinlock);  
 }
 
 void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
@@ -197,7 +210,6 @@ void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
       usleep(1);
   } while(retval!=0);
   /* This next statement will likely not work on many machines */
-  VAR(___this___)->___threadid___=thread;
 
   pthread_attr_destroy(&nattr);
 }