add more comments

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

diff --git a/Robust/src/Runtime/object.c b/Robust/src/Runtime/object.c
index 352637d10e7a019fce3cb936fa3d4e0aea050be1..ab986ecbb141d16cd2f282fe1a8499e25446c887 100644 (file)
--- a/Robust/src/Runtime/object.c
+++ b/Robust/src/Runtime/object.c
@@ -6,7 +6,7 @@
 #include "thread.h"
 #endif
 
-int CALL01(___Object______hashCode____, struct ___Object___ * ___this___) {
+int CALL01(___Object______nativehashCode____, struct ___Object___ * ___this___) {
   return (int) VAR(___this___);
 }
 
@@ -20,26 +20,31 @@ int CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
   if (self==VAR(___this___)->tid) {
     VAR(___this___)->lockcount++;
   } else {
-#ifdef PRECISEGC
-    struct listitem *tmp=stopforgc(stackptr);
+#ifdef PRECISE_GC
+    struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
 #endif
     pthread_mutex_lock(&objlock);
-#ifdef PRECISEGC
+#ifdef PRECISE_GC
     restartaftergc(tmp);
 #endif
     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;
       }
       {
-#ifdef PRECISEGC
-       struct listitem *tmp=stopforgc(stackptr);
+#ifdef PRECISE_GC
+       struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
 #endif
        pthread_cond_wait(&objcond, &objlock);
-#ifdef PRECISEGC
+#ifdef PRECISE_GC
        restartaftergc(tmp);
 #endif
       }
@@ -51,8 +56,16 @@ 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___)->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);