From: jzhou <jzhou>
Date: Tue, 10 May 2011 22:47:45 +0000 (+0000)
Subject: Code clean
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90914e390549c573e787e981d31577f176ed0b3e;p=IRC.git

Code clean
---

diff --git a/Robust/src/Runtime/bamboo/GCSharedHash.c b/Robust/src/Runtime/bamboo/GCSharedHash.c
index 945a6ec2..c2e53409 100755
--- a/Robust/src/Runtime/bamboo/GCSharedHash.c
+++ b/Robust/src/Runtime/bamboo/GCSharedHash.c
@@ -7,20 +7,6 @@
 #include <stdio.h>
 #endif
 
-#ifndef INTPTR
-#ifdef BIT64
-#define INTPTR long
-#define INTPTRSHIFT 3
-#else
-#define INTPTR int
-#define INTPTRSHIFT 2
-#endif
-#endif
-
-#ifndef INLINE
-#define INLINE    inline __attribute__((always_inline))
-#endif // #ifndef INLINE
-
 #define GC_SHIFT_BITS  4
 
 /* GCSHARED HASH ********************************************************/
diff --git a/Robust/src/Runtime/bamboo/GCSharedHash.h b/Robust/src/Runtime/bamboo/GCSharedHash.h
index bfcd6204..6d0fe470 100755
--- a/Robust/src/Runtime/bamboo/GCSharedHash.h
+++ b/Robust/src/Runtime/bamboo/GCSharedHash.h
@@ -3,18 +3,7 @@
 #ifndef GCSHAREDHASH_H
 #define GCSHAREDHASH_H
 
-#ifndef bool
-#define bool int
-#endif
-
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
+#include "multicore.h"
 #include "mem.h"
 
 /* GCSharedHash *********************************************************/
diff --git a/Robust/src/Runtime/bamboo/MGCHash.c b/Robust/src/Runtime/bamboo/MGCHash.c
index f85a1ade..598162b7 100644
--- a/Robust/src/Runtime/bamboo/MGCHash.c
+++ b/Robust/src/Runtime/bamboo/MGCHash.c
@@ -8,16 +8,6 @@
 #include "dmalloc.h"
 #endif
 
-#ifndef INTPTR
-#ifdef BIT64
-#define INTPTR long
-#define INTPTRSHIFT 3
-#else
-#define INTPTR int
-#define INTPTRSHIFT 2
-#endif
-#endif
-
 #define GC_SHIFT_BITS 4
 
 /* mgchash ********************************************************/
diff --git a/Robust/src/Runtime/bamboo/MGCHash.h b/Robust/src/Runtime/bamboo/MGCHash.h
index 65a03ec3..cf2c24dd 100644
--- a/Robust/src/Runtime/bamboo/MGCHash.h
+++ b/Robust/src/Runtime/bamboo/MGCHash.h
@@ -1,22 +1,7 @@
 #ifndef MGCHASH_H
 #define MGCHASH_H
 
-#ifndef bool
-#define bool int
-#endif
-
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
-#ifndef INLINE
-#define INLINE    inline __attribute__((always_inline))
-#endif
-
+#include "multicore.h"
 #include "mem.h"
 
 /* mgchash *********************************************************/
diff --git a/Robust/src/Runtime/bamboo/multicore.h b/Robust/src/Runtime/bamboo/multicore.h
index 04a61915..6d991b18 100644
--- a/Robust/src/Runtime/bamboo/multicore.h
+++ b/Robust/src/Runtime/bamboo/multicore.h
@@ -8,9 +8,25 @@
 
 #ifndef bool
 #define bool int
+#endif
+
+#ifndef true
 #define true 1
+#endif
+
+#ifndef false
 #define false 0
 #endif
 
+#ifndef INTPTR
+#ifdef BIT64
+#define INTPTR long
+#define INTPTRSHIFT 3
+#else
+#define INTPTR int
+#define INTPTRSHIFT 2
+#endif
+#endif
+
 #endif // MULTICORE
 #endif // BAMBOO_MULTICORE_H
diff --git a/Robust/src/Runtime/bamboo/multicoregarbage.c b/Robust/src/Runtime/bamboo/multicoregarbage.c
index 6fbbc6d2..8a42ae66 100644
--- a/Robust/src/Runtime/bamboo/multicoregarbage.c
+++ b/Robust/src/Runtime/bamboo/multicoregarbage.c
@@ -9,11 +9,6 @@
 #include "multicoreruntime.h"
 #include "multicoregcprofile.h"
 #include "gcqueue.h"
-#ifdef MGC
-#include "runtime_arch.h"
-
-extern int corenum;
-#endif
 
 #ifdef SMEMM
 extern unsigned int gcmem_mixed_threshold;
diff --git a/Robust/src/Runtime/bamboo/multicoregccompact.c b/Robust/src/Runtime/bamboo/multicoregccompact.c
index d3abf117..b6cdf3d0 100644
--- a/Robust/src/Runtime/bamboo/multicoregccompact.c
+++ b/Robust/src/Runtime/bamboo/multicoregccompact.c
@@ -3,8 +3,6 @@
 #include "runtime_arch.h"
 #include "multicoreruntime.h"
 
-extern int corenum;
-
 INLINE bool gc_checkCoreStatus() {
   BAMBOO_ENTER_RUNTIME_MODE_FROM_CLIENT();
   for(int i = 0; i < NUMCORES4GC; ++i) {
diff --git a/Robust/src/Runtime/bamboo/multicoregcflush.c b/Robust/src/Runtime/bamboo/multicoregcflush.c
index d2578ecf..8a5e96d3 100644
--- a/Robust/src/Runtime/bamboo/multicoregcflush.c
+++ b/Robust/src/Runtime/bamboo/multicoregcflush.c
@@ -4,11 +4,6 @@
 #include "ObjectHash.h"
 #include "GenericHashtable.h"
 #include "gcqueue.h"
-#ifdef MGC
-#include "runtime_arch.h"
-
-extern int corenum;
-#endif
 
 /* Task specific includes */
 
diff --git a/Robust/src/Runtime/bamboo/multicoregcmark.c b/Robust/src/Runtime/bamboo/multicoregcmark.c
index 08f69d5a..419eb0ec 100644
--- a/Robust/src/Runtime/bamboo/multicoregcmark.c
+++ b/Robust/src/Runtime/bamboo/multicoregcmark.c
@@ -4,13 +4,7 @@
 #include "multicoreruntime.h"
 #include "GenericHashtable.h"
 #include "gcqueue.h"
-#ifdef MGC
-#include "runtime_arch.h"
-
-extern int corenum;
-#endif
 
-extern int corenum;
 #ifdef TASK
 extern struct parameterwrapper ** objectqueues[][NUMCLASSES];
 extern int numqueues[][NUMCLASSES];
diff --git a/Robust/src/Runtime/bamboo/multicoregcprofile.c b/Robust/src/Runtime/bamboo/multicoregcprofile.c
index 63911990..72d7f152 100644
--- a/Robust/src/Runtime/bamboo/multicoregcprofile.c
+++ b/Robust/src/Runtime/bamboo/multicoregcprofile.c
@@ -5,8 +5,6 @@
 #include "structdefs.h"
 #include "mem.h"
 
-extern int corenum;
-
 INLINE void initmulticoregcprofiledata() {
   if(STARTUPCORE == BAMBOO_NUM_OF_CORE) {
     // startup core to initialize corestatus[]
diff --git a/Robust/src/Runtime/bamboo/multicoremem.c b/Robust/src/Runtime/bamboo/multicoremem.c
index d65a70be..44e373d5 100644
--- a/Robust/src/Runtime/bamboo/multicoremem.c
+++ b/Robust/src/Runtime/bamboo/multicoremem.c
@@ -2,8 +2,6 @@
 #include "runtime_arch.h"
 #include "multicoreruntime.h"
 
-extern int corenum;
-
 #ifdef MULTICORE_GC
 #include "multicorehelper.h"
 
diff --git a/Robust/src/Runtime/bamboo/multicoremgc.h b/Robust/src/Runtime/bamboo/multicoremgc.h
index d0410207..a783596d 100644
--- a/Robust/src/Runtime/bamboo/multicoremgc.h
+++ b/Robust/src/Runtime/bamboo/multicoremgc.h
@@ -1,6 +1,7 @@
 #ifndef BAMBOO_MULTICORE_MGC_H
 #define BAMBOO_MULTICORE_MGC_H
 #ifdef MGC
+#include "runtime_arch.h"
 // shared memory pointer for global thread queue
 // In MGC version, this block of memory is located at the very bottom of the 
 // shared memory with the base address as BAMBOO_BASE_VA.
@@ -16,7 +17,5 @@
 unsigned int * bamboo_thread_queue;
 unsigned int bamboo_max_thread_num_mask;
 unsigned int bamboo_current_thread;
-
-//extern int corenum;
 #endif // MGC
 #endif // BAMBOO_MULTICORE_MGC_H
diff --git a/Robust/src/Runtime/bamboo/multicoremsg.c b/Robust/src/Runtime/bamboo/multicoremsg.c
index 5a783fed..9df331c3 100644
--- a/Robust/src/Runtime/bamboo/multicoremsg.c
+++ b/Robust/src/Runtime/bamboo/multicoremsg.c
@@ -4,12 +4,6 @@
 #include "multicoreruntime.h"
 #include "multicoretaskprofile.h"
 #include "gcqueue.h"
-#ifdef MGC
-#include "structdefs.h"
-#include "runtime_arch.h"
-
-extern int corenum;
-#endif
 
 int msgsizearray[] = {
   0, //MSGSTART,
diff --git a/Robust/src/Runtime/bamboo/multicoreruntime.c b/Robust/src/Runtime/bamboo/multicoreruntime.c
index 86a33bfb..ad40a02b 100644
--- a/Robust/src/Runtime/bamboo/multicoreruntime.c
+++ b/Robust/src/Runtime/bamboo/multicoreruntime.c
@@ -3,9 +3,6 @@
 #include "runtime.h"
 #include "multicoreruntime.h"
 #include "methodheaders.h"
-#ifdef MGC
-#include "runtime_arch.h"
-#endif
 
 extern int classsize[];
 extern int typearray[];
@@ -16,7 +13,6 @@ extern int* supertypes[];
 extern struct genhashtable * activetasks;
 #endif
 
-int debugtask=0;
 #ifdef MGC
 int corenum = 0;
 #endif
diff --git a/Robust/src/Runtime/bamboo/multicoretask.c b/Robust/src/Runtime/bamboo/multicoretask.c
index 5c922fd8..77e89921 100644
--- a/Robust/src/Runtime/bamboo/multicoretask.c
+++ b/Robust/src/Runtime/bamboo/multicoretask.c
@@ -3,10 +3,7 @@
 #include "multicoreruntime.h"
 #include "multicoretaskprofile.h"
 #include "multicoretask.h"
-
-#ifndef INLINE
-#define INLINE    inline __attribute__((always_inline))
-#endif 
+#include "multicore.h"
 
 //  data structures for task invocation
 struct genhashtable * activetasks;