drop locks if a thread crashes

[IRC.git] / Robust / src / Runtime / garbage.c

diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index 8b8d7370067fceca3779e8c781bea1cc6ec23fb9..4fced6a9393ff0e6ac79e875bd4f12d6847ad5ba 100644 (file)
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -115,6 +115,11 @@ void collect(struct garbagelist * stackptr) {
 #ifdef THREADS
   /* Go to next thread */
   if (listptr!=NULL) {
+    void * orig=listptr->locklist;
+    void * copy;
+    if (gc_createcopy(orig,&copy))
+      enqueue(orig);
+    listptr->locklist=copy;
     stackptr=listptr->stackptr;
     listptr=listptr->next;
   }
@@ -292,6 +297,7 @@ void checkcollect(void * ptr) {
 struct listitem * stopforgc(struct garbagelist * ptr) {
   struct listitem * litem=malloc(sizeof(struct listitem));
   litem->stackptr=ptr;
+  litem->locklist=pthread_getspecific(threadlocks);
   litem->prev=NULL;
   pthread_mutex_lock(&gclistlock);
   litem->next=list;
@@ -306,6 +312,7 @@ struct listitem * stopforgc(struct garbagelist * ptr) {
 
 void restartaftergc(struct listitem * litem) {
   pthread_mutex_lock(&gclistlock);
+  pthread_setspecific(threadlocks, litem->locklist);
   if (litem->prev==NULL) {
     list=litem->next;
   } else {