Cleaning up the CMK_BLUEGENEP usages in the new conditionally compiled file.
authorIsaac Dooley <idooley2@illinois.edu>
Thu, 3 Sep 2009 17:32:12 +0000 (17:32 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Thu, 3 Sep 2009 17:32:12 +0000 (17:32 +0000)
src/ck-perf/trace-controlPoints-BGP.C
src/ck-perf/trace-controlPoints.C
src/ck-perf/trace-controlPointsBOC.h
src/scripts/Makefile

index 667573fccafe1b155376d94b16c82e8d6f3e5cb0..6ba7e8529093c963b5f9d684c4c4f0c13f1f2678 100644 (file)
@@ -1,7 +1,5 @@
 #include "conv-mach.h" 
 
-#ifdef CMK_BLUEGENEP
-
 #include <spi/UPC.h>
 #include <spi/UPC_Events.h>
 #include <iostream>
@@ -84,19 +82,4 @@ void printBGP_UPC_Counters(void) {
     BGP_UPC_Start(0);
     
 }
-#else
-
-
-void printBGP_UPC_Counters(void){
-// do nothing since not on BGP
-}
-
-
-
-void initBGP_UPC_Counters(void){
-// do nothing since not on BGP
-}
-
-
 
-#endif
index 562274fe83ff03bd766867690966cb57a23cf163..f9a06b38fab80db8b0524deaeea36acd1f36dd35 100644 (file)
@@ -159,9 +159,9 @@ void TraceControlPoints::traceClose(void)
 void printBGP_UPC_Counters(void);
 
 void TraceControlPointsBOC::printBGP_UPC_CountersBOC(void) {
-//    if(CkMyPe() == 0){
+#ifdef CMK_BLUEGENEP
        printBGP_UPC_Counters();
-       //   }
+#endif
 }
 
 
index 47e63159863e363581b3487cf92d98bc9b5ac13d..b1aa42021624edca2f7fcc56f9bb01c2d8255fdb 100644 (file)
@@ -2,7 +2,9 @@
 
 extern CkGroupID traceControlPointsGID;
 
+#ifdef CMK_BLUEGENEP
 void initBGP_UPC_Counters(void);
+#endif
 
 // We typically declare parallel object classes here for the purposes of
 // performing parallel operations for the trace module after the main
@@ -29,7 +31,9 @@ class TraceControlPointsInit : public Chare {
 class TraceControlPointsBOC : public CBase_TraceControlPointsBOC {
 public:
   TraceControlPointsBOC(void) {
+#ifdef CMK_BLUEGENEP
       initBGP_UPC_Counters();
+#endif
   };
   TraceControlPointsBOC(CkMigrateMessage *m) {};
 
index 3a714560a5808b32aa732e854012f120cd15657b..87b9ac9fee6fb4aa947c18022d24aca2910475d6 100644 (file)
@@ -834,8 +834,6 @@ $(L)/libtrace-Tau.a: $(TAU_TRACE_OBJ) tau_selective.o
 # Note there is a BG/P specific addition to this target in Makefile.machine
 LIBTRACE_CONTROLPOINTS=trace-controlPoints.o
 $(L)/libtrace-controlPoints.a: $(LIBTRACE_CONTROLPOINTS)
-       echo "libtrace-controlPoints dependencies : " 
-       echo $^
        $(CHARMC) -o $@ $^