missing changes

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

diff --git a/Robust/src/Runtime/object.c b/Robust/src/Runtime/object.c
index a7e1062ac0fe2073ba804910bba50d46142d88df..4dbb7f0ba59ef5c97bb1bcf6cc4131b354f7564e 100644 (file)
--- a/Robust/src/Runtime/object.c
+++ b/Robust/src/Runtime/object.c
@@ -13,6 +13,13 @@
 #include "mlp_lock.h"
 #endif
 
+#ifndef MAC
+__thread struct lockvector lvector;
+__thread int mythreadid;
+#else
+
+#endif
+
 #ifdef D___Object______nativehashCode____
 int CALL01(___Object______nativehashCode____, struct ___Object___ * ___this___) {
   return (int)((INTPTR) VAR(___this___));
@@ -37,130 +44,98 @@ int CALL01(___Object______getType____, struct ___Object___ * ___this___) {
 
 #ifdef THREADS
 #ifdef D___Object______MonitorEnter____
-int CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
-#ifndef NOLOCK
-  pthread_t self=pthread_self();
+void CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
+#ifdef MAC
+  struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
+  int self=(int)(long)pthread_getspecific(macthreadid);
+#else
+  struct lockvector *lptr=&lvector;
+  int self=mythreadid;
+#endif
+  struct lockpair *lpair=&lptr->locks[lptr->index++];
+  lpair->object=VAR(___this___);
+
   if (self==VAR(___this___)->tid) {
-    atomic_inc(&VAR(___this___)->lockcount);
+    lpair->islastlock=0;
   } else {
+    lpair->islastlock=1;
     while(1) {
-      if (CAS32(&VAR(___this___)->lockcount, 0, 1)==0) {
-       VAR(___this___)->___prevlockobject___=NULL;
-       VAR(___this___)->___nextlockobject___=(struct ___Object___ *)pthread_getspecific(threadlocks);
-       if (VAR(___this___)->___nextlockobject___!=NULL)
-         VAR(___this___)->___nextlockobject___->___prevlockobject___=VAR(___this___);
-       pthread_setspecific(threadlocks, VAR(___this___));
-       VAR(___this___)->tid=self;
-       pthread_mutex_unlock(&objlock);
-       BARRIER();
-       return;
+      if (VAR(___this___)->tid==0) {
+       if (CAS32(&VAR(___this___)->tid, 0, self)==0) {
+         return;
+       }
       }
       {
 #ifdef PRECISE_GC
-       stopforgc((struct garbagelist *)___params___);
-#endif
-#ifdef PRECISE_GC
-       restartaftergc();
+       if (unlikely(needtocollect))
+         checkcollect((struct garbagelist *)___params___);
 #endif
       }
     }
   }
-#endif
 }
 #endif
 
 
 #ifdef D___Object______notify____
 void CALL01(___Object______notify____, struct ___Object___ * ___this___) {
+  VAR(___this___)->notifycount++;
 }
 #endif
 
 #ifdef D___Object______notifyAll____
 void CALL01(___Object______notifyAll____, struct ___Object___ * ___this___) {
+  VAR(___this___)->notifycount++;
 }
 #endif
 
 #ifdef D___Object______wait____
 void CALL01(___Object______wait____, struct ___Object___ * ___this___) {
-  pthread_t self=pthread_self();
-  int lockcount=VAR(___this___)->lockcount;
-  //release lock
-  if (VAR(___this___)->___prevlockobject___==NULL) {
-    pthread_setspecific(threadlocks, VAR(___this___)->___nextlockobject___);
-  } else
-    VAR(___this___)->___prevlockobject___->___nextlockobject___=VAR(___this___)->___nextlockobject___;
-  if (VAR(___this___)->___nextlockobject___!=NULL)
-    VAR(___this___)->___nextlockobject___->___prevlockobject___=VAR(___this___)->___prevlockobject___;
-  VAR(___this___)->___nextlockobject___=NULL;
-  VAR(___this___)->___prevlockobject___=NULL;
-  //VAR(___this___)->lockentry=NULL;
+#ifdef MAC
+  int self=(int)(long)pthread_getspecific(macthreadid);
+#else
+  int self=mythreadid;
+#endif
+  int notifycount=VAR(___this___)->notifycount;
+  BARRIER();
   VAR(___this___)->tid=0;
-  //release lock
   BARRIER();
-  VAR(___this___)->lockcount=0;
   
-  //allow gc
+  while(notifycount==VAR(___this___)->notifycount) {
 #ifdef PRECISE_GC
-  stopforgc((struct garbagelist *)___params___);
-#endif
-  sched_yield();
-#ifdef PRECISE_GC
-  restartaftergc();
+    if (unlikely(needtocollect))
+      checkcollect((struct garbagelist *)___params___);
 #endif
+  }
 
   while(1) {
-    if (CAS32(&VAR(___this___)->lockcount, 0, lockcount)==0) {
-      VAR(___this___)->___prevlockobject___=NULL;
-      VAR(___this___)->___nextlockobject___=(struct ___Object___ *)pthread_getspecific(threadlocks);
-      if (VAR(___this___)->___nextlockobject___!=NULL)
-       VAR(___this___)->___nextlockobject___->___prevlockobject___=VAR(___this___);
-      pthread_setspecific(threadlocks, VAR(___this___));
-      VAR(___this___)->tid=self;
-      pthread_mutex_unlock(&objlock);
-      BARRIER();
-      return;
+    if (VAR(___this___)->tid==0) {
+      if (CAS32(&VAR(___this___)->tid, 0, self)==0) {
+       BARRIER();
+       return;
+      }
     }
-    {
-#ifdef PRECISE_GC
-      stopforgc((struct garbagelist *)___params___);
-#endif
 #ifdef PRECISE_GC
-      restartaftergc();
+    if (unlikely(needtocollect))
+      checkcollect((struct garbagelist *)___params___);
 #endif
-    }
   }
 }
 #endif
 
 #ifdef D___Object______MonitorExit____
-int CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
-#ifndef NOLOCK
-  pthread_t self=pthread_self();
-  if (self==VAR(___this___)->tid) {
-    //release one lock...
-    BARRIER();
-    if (VAR(___this___)->lockcount==1) {
-      if (VAR(___this___)->___prevlockobject___==NULL) {
-       pthread_setspecific(threadlocks, VAR(___this___)->___nextlockobject___);
-      } else
-       VAR(___this___)->___prevlockobject___->___nextlockobject___=VAR(___this___)->___nextlockobject___;
-      if (VAR(___this___)->___nextlockobject___!=NULL)
-       VAR(___this___)->___nextlockobject___->___prevlockobject___=VAR(___this___)->___prevlockobject___;
-      VAR(___this___)->___nextlockobject___=NULL;
-      VAR(___this___)->___prevlockobject___=NULL;
-      //VAR(___this___)->lockentry=NULL;
-      VAR(___this___)->tid=0;
-    }
-    atomic_dec(&VAR(___this___)->lockcount);
-  } else {
-#ifdef MULTICORE
-    BAMBOO_EXIT(0xf201);
+void CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
+#ifdef MAC
+  struct lockvector *lptr=(struct lockvector *)pthread_getspecific(threadlocks);
 #else
-    printf("ERROR...UNLOCKING LOCK WE DON'T HAVE\n");
-    exit(-1);
+  struct lockvector *lptr=&lvector;
 #endif
+  struct lockpair *lpair=&lptr->locks[--lptr->index];
+  
+  if (lpair->islastlock) {
+    MBARRIER();
+    lpair->object->tid=0;
   }
-#endif
 }
 #endif
 #endif