missing changes

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

diff --git a/Robust/src/Runtime/object.c b/Robust/src/Runtime/object.c
index 8b09a3b2e15c82444c1c7f45c1c3c69fd860a257..4dbb7f0ba59ef5c97bb1bcf6cc4131b354f7564e 100644 (file)
--- a/Robust/src/Runtime/object.c
+++ b/Robust/src/Runtime/object.c
@@ -9,77 +9,133 @@
 #ifdef THREADS
 #include "thread.h"
 #endif
+#ifndef MULTICORE
+#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___));
 }
+#endif
 
+#ifdef D___Object______hashCode____
+int CALL01(___Object______hashCode____, struct ___Object___ * ___this___) {
+  if (!VAR(___this___)->___cachedHash___) {
+    VAR(___this___)->___cachedHash___=1;
+    VAR(___this___)->___cachedCode___=(int)((INTPTR)VAR(___this___));
+  }
+  return VAR(___this___)->___cachedCode___;
+}
+#endif
+
+#ifdef D___Object______getType____
 int CALL01(___Object______getType____, struct ___Object___ * ___this___) {
   return ((int *)VAR(___this___))[0];
 }
+#endif
 
 #ifdef THREADS
-int CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
-  pthread_t self=pthread_self();
+#ifdef D___Object______MonitorEnter____
+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) {
-    VAR(___this___)->lockcount++;
+    lpair->islastlock=0;
   } else {
-#ifdef PRECISE_GC
-    stopforgc((struct garbagelist *)___params___);
-#endif
-    pthread_mutex_lock(&objlock);
-#ifdef PRECISE_GC
-    restartaftergc();
-#endif
+    lpair->islastlock=1;
     while(1) {
       if (VAR(___this___)->tid==0) {
-       VAR(___this___)->___Object______prevlockobject___=NULL;
-       VAR(___this___)->___Object______nextlockobject___=(struct ___Object___ *)pthread_getspecific(threadlocks);
-       if (VAR(___this___)->___Object______nextlockobject___!=NULL)
-         VAR(___this___)->___Object______nextlockobject___->___Object______prevlockobject___=VAR(___this___);
-       pthread_setspecific(threadlocks, VAR(___this___));
-       VAR(___this___)->lockcount=1;
-       VAR(___this___)->tid=self;
-       pthread_mutex_unlock(&objlock);
-       break;
+       if (CAS32(&VAR(___this___)->tid, 0, self)==0) {
+         return;
+       }
       }
       {
 #ifdef PRECISE_GC
-       stopforgc((struct garbagelist *)___params___);
+       if (unlikely(needtocollect))
+         checkcollect((struct garbagelist *)___params___);
 #endif
-       pthread_cond_wait(&objcond, &objlock);
+      }
+    }
+  }
+}
+#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___) {
+#ifdef MAC
+  int self=(int)(long)pthread_getspecific(macthreadid);
+#else
+  int self=mythreadid;
+#endif
+  int notifycount=VAR(___this___)->notifycount;
+  BARRIER();
+  VAR(___this___)->tid=0;
+  BARRIER();
+  
+  while(notifycount==VAR(___this___)->notifycount) {
 #ifdef PRECISE_GC
-       restartaftergc();
+    if (unlikely(needtocollect))
+      checkcollect((struct garbagelist *)___params___);
 #endif
+  }
+
+  while(1) {
+    if (VAR(___this___)->tid==0) {
+      if (CAS32(&VAR(___this___)->tid, 0, self)==0) {
+       BARRIER();
+       return;
       }
     }
+#ifdef PRECISE_GC
+    if (unlikely(needtocollect))
+      checkcollect((struct garbagelist *)___params___);
+#endif
   }
 }
+#endif
 
-int CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
-  pthread_t self=pthread_self();
-  if (self==VAR(___this___)->tid) {
-    VAR(___this___)->lockcount--;
-    if (VAR(___this___)->lockcount==0) {
-      if (VAR(___this___)->___Object______prevlockobject___==NULL) {
-       pthread_setspecific(threadlocks, VAR(___this___)->___Object______nextlockobject___);
-      } else
-       VAR(___this___)->___Object______prevlockobject___->___Object______nextlockobject___=VAR(___this___)->___Object______nextlockobject___;
-      if (VAR(___this___)->___Object______nextlockobject___!=NULL)
-       VAR(___this___)->___Object______nextlockobject___->___Object______prevlockobject___=VAR(___this___)->___Object______prevlockobject___;
-      VAR(___this___)->lockentry=NULL;
-      VAR(___this___)->tid=0;
-    }
-    pthread_mutex_lock(&objlock);
-    pthread_cond_broadcast(&objcond);
-    pthread_mutex_unlock(&objlock);
-  } else {
-#ifdef MULTICORE
-    BAMBOO_EXIT(0xf201);
+#ifdef D___Object______MonitorExit____
+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