From: jzhou <jzhou>
Date: Wed, 2 Mar 2011 19:28:38 +0000 (+0000)
Subject: Fix the field name for object.c and thread.c, there are no Class name prefix anymore
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7937299d1d5a351baa849f6fa4e997c24066ce37;p=IRC.git

Fix the field name for object.c and thread.c, there are no Class name prefix anymore
---

diff --git a/Robust/src/Runtime/object.c b/Robust/src/Runtime/object.c
index 8b09a3b2..c552b4c5 100644
--- a/Robust/src/Runtime/object.c
+++ b/Robust/src/Runtime/object.c
@@ -33,10 +33,10 @@ int CALL01(___Object______MonitorEnter____, struct ___Object___ * ___this___) {
 #endif
     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___);
+	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;
@@ -61,12 +61,12 @@ int CALL01(___Object______MonitorExit____, struct ___Object___ * ___this___) {
   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___);
+      if (VAR(___this___)->___prevlockobject___==NULL) {
+	pthread_setspecific(threadlocks, VAR(___this___)->___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___)->___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;
     }
diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index 848243d0..c46b1000 100644
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -65,9 +65,9 @@ void threadexit() {
 #ifdef THREADS
   struct ___Object___ *ll=pthread_getspecific(threadlocks);
   while(ll!=NULL) {
-    struct ___Object___ *llnext=ll->___Object______nextlockobject___;
-    ll->___Object______nextlockobject___=NULL;
-    ll->___Object______prevlockobject___=NULL;
+    struct ___Object___ *llnext=ll->___nextlockobject___;
+    ll->___nextlockobject___=NULL;
+    ll->___prevlockobject___=NULL;
     ll->lockcount=0;
     ll->tid=0; //unlock it
     ll=llnext;
@@ -346,7 +346,7 @@ void initthread(struct ___Thread___ * ___this___) {
 #else
   ___Thread______staticStart____L___Thread___(___this___);
 #endif
-  ___this___->___Thread______finished___=1;
+  ___this___->___finished___=1;
   pthread_mutex_lock(&joinlock);
   pthread_cond_signal(&joincond);
   pthread_mutex_unlock(&joinlock);
@@ -477,7 +477,7 @@ transstart:
 #if defined(THREADS)||defined(STM)
 void CALL01(___Thread______nativeJoin____, struct ___Thread___ * ___this___) {
   pthread_mutex_lock(&joinlock);
-  while(!VAR(___this___)->___Thread______finished___) {
+  while(!VAR(___this___)->___finished___) {
 #ifdef PRECISE_GC
   stopforgc((struct garbagelist *)___params___);
 #endif