changes

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

diff --git a/Robust/src/Runtime/object.c b/Robust/src/Runtime/object.c
index 0bff6175391fbe6eb589233fe2b707f828f391b9..d9b775b49fa56d053efd726ebed4d193e6f279bf 100644 (file)
--- a/Robust/src/Runtime/object.c
+++ b/Robust/src/Runtime/object.c
@@ -1,6 +1,6 @@
 #include "object.h"
-#ifdef RAW
-#include <raw.h>
+#ifdef MULTICORE
+#include "runtime_arch.h"
 #else
 #include "stdio.h"
 #endif
@@ -9,77 +9,129 @@
 #ifdef THREADS
 #include "thread.h"
 #endif
+#ifndef MULTICORE
+#include "mlp_lock.h"
+#endif
+
+#ifndef MAC
+#ifdef THREADS
+__thread struct lockvector lvector;
+__thread int mythreadid;
+#endif
+#else
 
-int CALL01(___Object______nativehashCode____, struct ___Object___ * ___this___) {
-  return (int) VAR(___this___);
+#endif
+
+#ifdef D___Object______hashCode____
+int CALL01(___Object______hashCode____, struct ___Object___ * ___this___) {
+  return VAR(___this___)->hashcode;
 }
+#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___) {
+#ifndef NOLOCK
+#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
-    struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
-#endif
-    pthread_mutex_lock(&objlock);
-#ifdef PRECISE_GC
-    restartaftergc(tmp);
-#endif
+    lpair->islastlock=1;
     while(1) {
       if (VAR(___this___)->tid==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___)->lockcount=1;
-       VAR(___this___)->tid=self;
-       pthread_mutex_unlock(&objlock);
-       break;
+        if (CAS32(&VAR(___this___)->tid, 0, self)==0) {
+          return;
+        }
       }
       {
 #ifdef PRECISE_GC
-       struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
+        if (unlikely(needtocollect))
+          checkcollect((struct garbagelist *)___params___);
+#endif
+      }
+    }
+  }
+#endif
+}
 #endif
-       pthread_cond_wait(&objcond, &objlock);
+
+
+#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(tmp);
+    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___)->___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___)->lockentry=NULL;
-      VAR(___this___)->tid=0;
-    }
-    pthread_mutex_lock(&objlock);
-    pthread_cond_broadcast(&objcond);
-    pthread_mutex_unlock(&objlock);
-  } else {
-#ifdef RAW
-         raw_test_done(-1);
+#ifdef D___Object______MonitorExit____
+void CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
+#ifndef NOLOCK
+#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