Fix bug for MGC garbage collection

diff --git a/Robust/src/ClassLibrary/MGC/gnu/File.java b/Robust/src/ClassLibrary/MGC/gnu/File.java
index 0e11599cc5fdfa685fddbea0e7cb641cac8777c3..980ead1350e6e9515048a2175c1a24b518714f52 100644 (file)
--- a/Robust/src/ClassLibrary/MGC/gnu/File.java
+++ b/Robust/src/ClassLibrary/MGC/gnu/File.java
@@ -23,17 +23,17 @@ public class File {
   private static native long nativeLength(byte[] pathname);
   
   public boolean exists() {
-    System.println("Unimplemented File.exists()");
+    // TODO System.println("Unimplemented File.exists()");
     return false;
   }
   
   public boolean isDirectory() {
-    System.println("Unimplemented File.isDirectory()");
+    // TODO System.println("Unimplemented File.isDirectory()");
     return false;
   }
   
   public boolean mkdirs() {
-    System.println("Unimplemented File.mkdirs()");
+    // TODO System.println("Unimplemented File.mkdirs()");
     return false;
   }
   

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 6820811b927901d65876e3da4432a35e10ea6098..bdc4751b9f643ef9bdb6aba8ec79320c73772989 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1245,6 +1245,9 @@ public class BuildCode {
       int count=0;
       while(allit.hasNext()) {
        FieldDescriptor fd=(FieldDescriptor)allit.next();
+    if(fd.isStatic()) {
+      continue;
+    }
        TypeDescriptor type=fd.getType();
        if (type.isPtr())
          count++;

diff --git a/Robust/src/Runtime/bamboo/multicoregarbage.c b/Robust/src/Runtime/bamboo/multicoregarbage.c
index 7ca5f39c5403234b7a84be92c8386e92e16b316f..ff0b2c257d1879d1aa3ea151cefba34ab8ae164f 100644 (file)
--- a/Robust/src/Runtime/bamboo/multicoregarbage.c
+++ b/Robust/src/Runtime/bamboo/multicoregarbage.c
@@ -1082,6 +1082,7 @@ inline void tomark(struct garbagelist * stackptr) {
   gcbusystatus = true;
   gcnumlobjs = 0;
 
+
   int i,j;
   // enqueue current stack
   while(stackptr!=NULL) {
@@ -1099,14 +1100,16 @@ inline void tomark(struct garbagelist * stackptr) {
   GC_BAMBOO_DEBUGPRINT(0xe502);
 
   // enqueue static pointers global_defs_p
-  struct garbagelist * staticptr=(struct garbagelist *)global_defs_p;
-  while(staticptr != NULL) {
-       for(i=0; i<staticptr->size; i++) {
-         if(staticptr->array[i] != NULL) {
-               markObj(staticptr->array[i]);
+  if(STARTUPCORE == BAMBOO_NUM_OF_CORE) {
+       struct garbagelist * staticptr=(struct garbagelist *)global_defs_p;
+       while(staticptr != NULL) {
+         for(i=0; i<staticptr->size; i++) {
+               if(staticptr->array[i] != NULL) {
+                 markObj(staticptr->array[i]);
+               }
          }
+         staticptr = staticptr->next;
        }
-       staticptr = staticptr->next;
   }
   GC_BAMBOO_DEBUGPRINT(0xe503);
 
@@ -1184,13 +1187,15 @@ inline void tomark(struct garbagelist * stackptr) {
 
 #ifdef MGC
   // enqueue global thread queue
-  lockthreadqueue();
-  unsigned int thread_counter = *((unsigned int*)(bamboo_thread_queue+1));
-  if(thread_counter > 0) {
-       unsigned int start = *((unsigned int*)(bamboo_thread_queue+2));
-       for(i = thread_counter; i > 0; i--) {
-         markObj((void *)bamboo_thread_queue[4+start]);
-         start = (start+1)&bamboo_max_thread_num_mask;
+  if(STARTUPCORE == BAMBOO_NUM_OF_CORE) {
+       lockthreadqueue();
+       unsigned int thread_counter = *((unsigned int*)(bamboo_thread_queue+1));
+       if(thread_counter > 0) {
+         unsigned int start = *((unsigned int*)(bamboo_thread_queue+2));
+         for(i = thread_counter; i > 0; i--) {
+               markObj((void *)bamboo_thread_queue[4+start]);
+               start = (start+1)&bamboo_max_thread_num_mask;
+         }
        }
   }
 
@@ -1331,6 +1336,7 @@ inline void mark(bool isfirst,
                send_msg_4(STARTUPCORE, GCFINISHMARK, BAMBOO_NUM_OF_CORE,
                                   gcself_numsendobjs, gcself_numreceiveobjs, false);
                sendStall = true;
+               tprintf("Make finished %x \n", (int)BAMBOO_NUM_OF_CORE);
       }
     }  // if(STARTUPCORE == BAMBOO_NUM_OF_CORE) ...
     GC_BAMBOO_DEBUGPRINT(0xed0a);
@@ -2217,12 +2223,14 @@ inline void flushRuntimeObj(struct garbagelist * stackptr) {
   }
 
   // flush static pointers global_defs_p
-  struct garbagelist * staticptr=(struct garbagelist *)global_defs_p;
-  for(i=0; i<staticptr->size; i++) {
-       if(staticptr->array[i] != NULL) {
-         void * dst = flushObj(staticptr->array[i]);
-         if(dst != NULL) {
-               staticptr->array[i] = dst;
+  if(STARTUPCORE == BAMBOO_NUM_OF_CORE) {
+       struct garbagelist * staticptr=(struct garbagelist *)global_defs_p;
+       for(i=0; i<staticptr->size; i++) {
+         if(staticptr->array[i] != NULL) {
+               void * dst = flushObj(staticptr->array[i]);
+               if(dst != NULL) {
+                 staticptr->array[i] = dst;
+               }
          }
        }
   }
@@ -2318,17 +2326,18 @@ inline void flushRuntimeObj(struct garbagelist * stackptr) {
 
 #ifdef MGC
   // flush global thread queue
-  unsigned int thread_counter = *((unsigned int*)(bamboo_thread_queue+1));
-  if(thread_counter > 0) {
-       unsigned int start = *((unsigned int*)(bamboo_thread_queue+2));
-       for(i = thread_counter; i > 0; i--) {
-         bamboo_thread_queue[4+start] = 
-               (INTPTR)(flushObj((void *)bamboo_thread_queue[4+start]));
-         start = (start+1)&bamboo_max_thread_num_mask;
+  if(STARTUPCORE == BAMBOO_NUM_OF_CORE) {
+       unsigned int thread_counter = *((unsigned int*)(bamboo_thread_queue+1));
+       if(thread_counter > 0) {
+         unsigned int start = *((unsigned int*)(bamboo_thread_queue+2));
+         for(i = thread_counter; i > 0; i--) {
+               bamboo_thread_queue[4+start] = 
+                 (INTPTR)(flushObj((void *)bamboo_thread_queue[4+start]));
+               start = (start+1)&bamboo_max_thread_num_mask;
+         }
        }
+       unlockthreadqueue();
   }
-
-  unlockthreadqueue();
 #endif
 } // void flushRuntimeObj(struct garbagelist * stackptr)