some missing check in

diff --git a/Robust/src/Runtime/MGCHash.c b/Robust/src/Runtime/MGCHash.c
index 24dfe051364e67a291aeb663d4d4e98c306b3211..8bbef86f15ea33d022e30ffae96cc8c7f5b6001b 100755 (executable)
--- a/Robust/src/Runtime/MGCHash.c
+++ b/Robust/src/Runtime/MGCHash.c
@@ -115,7 +115,7 @@ void mgchashInsert(void * key, void *val) {
   }
 }
 
-#ifdef MULTICORE
+#ifdef MULTICORE_GC
 void mgchashInsert_I(void * key, void *val) {
   mgchashlistnode_t *ptr;
 

diff --git a/Robust/src/Runtime/multicoretask.c b/Robust/src/Runtime/multicoretask.c
index f1af2a0324007bcdcbb5ac278f4e0ac7e3405c41..1b7c274a55df3e47f9ae343bd178e49a142644ed 100644 (file)
--- a/Robust/src/Runtime/multicoretask.c
+++ b/Robust/src/Runtime/multicoretask.c
@@ -406,6 +406,7 @@ void checkCoreStatus() {
 #ifdef USEIO
                                        totalexetime = BAMBOO_GET_EXE_TIME() - bamboo_start_time;
 #else
+
                                        BAMBOO_DEBUGPRINT(BAMBOO_GET_EXE_TIME() - bamboo_start_time);
                                        BAMBOO_DEBUGPRINT_REG(total_num_t6); // TODO for test
                                        BAMBOO_DEBUGPRINT(0xbbbbbbbb);
@@ -1642,10 +1643,10 @@ INLINE void processmsg_lockrequest_I() {
        int data4 = msgdata[msgdataindex]; // request core
        MSG_INDEXINC_I();
        // -1: redirected, 0: approved, 1: denied
-       deny = processlockrequest(locktype, data3, data2, data4, data4, true);  
+       int deny = processlockrequest(locktype, data3, data2, data4, data4, true);  
        if(deny == -1) {
                // this lock request is redirected
-               break;
+               return;
        } else {
                // send response msg
                // for 32 bit machine, the size is always 4 words
@@ -1743,10 +1744,10 @@ INLINE void processmsg_redirectlock_I() {
        MSG_INDEXINC_I(); //msgdata[4]; // root request core
        int data5 = msgdata[msgdataindex];
        MSG_INDEXINC_I(); //msgdata[5]; // request core
-       deny = processlockrequest(data1, data3, data2, data5, data4, true);
+       int deny = processlockrequest(data1, data3, data2, data5, data4, true);
        if(deny == -1) {
                // this lock request is redirected
-               break;
+               return;
        } else {
                // send response msg
                // for 32 bit machine, the size is always 4 words
@@ -2366,8 +2367,6 @@ INLINE void processmsg_gclobjmapping_I() {
 //               RAW version: -1 -- received nothing
 //                            otherwise -- received msg type
 int receiveObject() {
-  int deny = 0;
-  
 msg:
        // get the incoming msgs
   if(receiveMsg() == -1) {