From 506c2e3828ad8bf915e27fbc0e55b614684b4243 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Fri, 16 Feb 2007 05:53:33 +0000
Subject: [PATCH] bugs in my locking discipline

---
 Robust/src/IR/Flat/BuildCode.java | 16 ++++++++++++++--
 Robust/src/Runtime/garbage.c      |  3 +++
 Robust/src/Runtime/thread.c       |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index fc5d90ea..20f0892c 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -175,6 +175,8 @@ public class BuildCode {
 	outmethod.println("#include \"methodheaders.h\"");
 	outmethod.println("#include \"virtualtable.h\"");
 	outmethod.println("#include <runtime.h>");
+	if (state.THREAD)
+	    outmethod.println("#include <thread.h>");
 	if (state.main!=null) {
 	    outmethod.println("#include <string.h>");	    
 	}
@@ -249,6 +251,9 @@ public class BuildCode {
 	    } else {
 		outmethod.println("  struct ArrayObject * stringarray=allocate_newarray(STRINGARRAYTYPE, argc-1);");
 	    }
+	    if (state.THREAD) {
+		outmethod.println("initializethreads();");
+	    }
 	    outmethod.println("  for(i=1;i<argc;i++) {");
 	    outmethod.println("    int length=strlen(argv[i]);");
 	    if (GENERATEPRECISEGC) {
@@ -283,8 +288,15 @@ public class BuildCode {
 		outmethod.println("   }");
 		break;
 	    }
-	    if (state.THREAD)
-		outmethod.println("pthread_exit();");
+	    if (state.THREAD) {
+		outmethod.println("pthread_mutex_lock(&threadtable);");
+		outmethod.println("threadcount--;");
+		outmethod.println("pthread_mutex_unlock(&threadtable);");
+		outmethod.println("pthread_mutex_lock(&gclistlock);");
+		outmethod.println("pthread_cond_signal(&gccond);");
+		outmethod.println("pthread_mutex_unlock(&gclistlock);");
+		outmethod.println("pthread_exit(NULL);");
+	    }
 	    outmethod.println("}");
 	}
 	if (state.TASK)
diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index a3543512..bbd2f04f 100644
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -84,6 +84,8 @@ void collect(struct garbagelist * stackptr) {
     pthread_mutex_lock(&gclistlock);
     pthread_mutex_lock(&threadtable);
     if ((listcount+1)==threadcount) {
+      pthread_mutex_unlock(&threadtable);
+      pthread_mutex_unlock(&gclistlock);      
       break; /* Have all other threads stopped */
     }
     pthread_mutex_unlock(&threadtable);
@@ -286,6 +288,7 @@ void checkcollect(void * ptr) {
     struct listitem * tmp=stopforgc((struct garbagelist *)ptr);
     pthread_mutex_lock(&gclock);
     restartaftergc(tmp);
+    pthread_mutex_unlock(&gclock);
   }
 }
 
diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index 5e3b27cc..99e79cef 100644
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -31,6 +31,9 @@ void initthread(struct ___Thread___ * ___this___) {
   pthread_mutex_lock(&threadtable);
   threadcount--;
   pthread_mutex_unlock(&threadtable);
+  pthread_mutex_lock(&gclistlock);
+  pthread_cond_signal(&gccond);
+  pthread_mutex_unlock(&gclistlock);
 }
 
 void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
-- 
2.34.1