change makefile to remove priority-load balancer
authorYanhua Yanhua <sun51@illinois.edu>
Fri, 30 Jul 2010 22:57:11 +0000 (17:57 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Fri, 30 Jul 2010 22:57:11 +0000 (17:57 -0500)
src/conv-ldb/cldb.prioritycentralized.c
src/scripts/Makefile

index d34dd4da5e43748a7cb53ce6adec6c117f7fada1..8b5126713209e86013d810be0264a25a385feeb9 100644 (file)
@@ -42,7 +42,7 @@ char *CldGetStrategy(void)
   return "prioritycentralized";
 }
 
-inline void SendTasktoPe(int receiver, void *msg)
+void SendTasktoPe(int receiver, void *msg)
 {
     CldInfoFn ifn; 
     CldPackFn pfn;
@@ -86,11 +86,6 @@ static void CldStoreCharemsg(void *msg)
     int request_pe;
     void* loadmsg;
 
-    ifn = (CldInfoFn)CmiHandlerToFunction(CmiGetInfo(msg));
-    ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
-#if YH_DEBUG
-    CmiPrintf(" Step 2: on processor 0, Get new created msg and store it , PRIOR=%u Timer=%f\n", *prioptr, CmiTimer());
-#endif
     /* check whether there is processor with lower priority, it exists, push this task to that processor */
     /* find the processor with the highest priority */
     int i=0; 
@@ -98,6 +93,12 @@ static void CldStoreCharemsg(void *msg)
     int index = 1;
     double max_evaluation = 0;
     int old_load;
+   
+    ifn = (CldInfoFn)CmiHandlerToFunction(CmiGetInfo(msg));
+    ifn(msg, &pfn, &len, &queueing, &priobits, &prioptr);
+#if YH_DEBUG
+    CmiPrintf(" Step 2: on processor 0, Get new created msg and store it , PRIOR=%u Timer=%f\n", *prioptr, CmiTimer());
+#endif
     //check which processor has underload and also the task priority is lower than the msg priority
     for(i=1; i<CmiNumPes();i++)
     {   //underload to avoid overflow
index ca7f54bef2504e7526ff8f337a12d816491f52d5..889ea59ac4975f76b4f284687f3dfd9ab96f0c30 100644 (file)
@@ -327,7 +327,7 @@ dirs+sources:
 # Converse Libraries
 # 
 ###############################################################################
-CLBLIBS=$(L)/libldb-rand.o $(L)/libldb-spray.o $(L)/libldb-prioritycentralized.o   $(L)/libldb-workstealing.o  $(L)/libldb-neighbor.o $(L)/libldb-none.o $(L)/libldb-test.o $(L)/libldb-bluegene.o
+CLBLIBS=$(L)/libldb-rand.o $(L)/libldb-spray.o   $(L)/libldb-workstealing.o  $(L)/libldb-neighbor.o $(L)/libldb-none.o $(L)/libldb-test.o $(L)/libldb-bluegene.o
 TRACELIBS=$(L)/libtrace-projections.a  $(L)/libtrace-summary.a   $(L)/libtrace-utilization.a \
          $(L)/libtrace-simple.a \
           $(L)/libtrace-counter.a $(L)/libtrace-bluegene.a \
@@ -513,8 +513,8 @@ $(L)/libldb-spray.o: cldb.spray.c $(CVHEADERS)
        $(CHARMC) -o $@ cldb.spray.c
 
 
-$(L)/libldb-prioritycentralized.o: cldb.prioritycentralized.c cldb.prioritycentralized.h  $(CVHEADERS)
-       $(CHARMC) -o $@ cldb.prioritycentralized.c 
+#$(L)/libldb-prioritycentralized.o: cldb.prioritycentralized.c cldb.prioritycentralized.h  $(CVHEADERS)
+#      $(CHARMC) -o $@ cldb.prioritycentralized.c 
 
 #//$(L)/libldb-prioritycentralizedopt.o: cldb.prioritycentralizedopt.c cldb.prioritycentralizedopt.h  $(CVHEADERS)
 #//    $(CHARMC) -o $@ cldb.prioritycentralizedopt.c