Add doneInserting() and a functional make test target.
authorEric Bohm <ebohm@illinois.edu>
Wed, 19 Sep 2007 03:29:39 +0000 (03:29 +0000)
committerEric Bohm <ebohm@illinois.edu>
Wed, 19 Sep 2007 03:29:39 +0000 (03:29 +0000)
13 files changed:
examples/pose/ASIM/Worker.h
examples/pose/ASIM/pgm.C
examples/pose/HiSim/Main/Makefile
examples/pose/HiSim/Main/TCsim.h
examples/pose/HiSim/Main/build
examples/pose/LBSim/sched.C
examples/pose/MiniNet/Makefile
examples/pose/MiniNet/mininet.C
examples/pose/PHOLD/phold.C
examples/pose/Ring/Makefile
examples/pose/Ring/pgm.C
examples/pose/SimBenchmark/Makefile
examples/pose/SimBenchmark/pgm.C

index ac62bb0f33c9f031e4dfce578545aad8e54b6105..240ba23c4a3c3ecf655196a43951e7ef32cd6dfb 100644 (file)
@@ -144,5 +144,6 @@ class worker {
   void workLarge(LargeWorkMsg *m);
   void workLarge_anti(LargeWorkMsg *m);
   void workLarge_commit(LargeWorkMsg *m);
+  void terminus(){}
 };
 
index 3f8f97d45690ac709ba9bb57fd8119b284a73308..fe6e31151310e9de7bf0298be9dc55725df5b27f 100644 (file)
@@ -164,6 +164,7 @@ main::main(CkArgMsg *m)
     else
       (*(CProxy_worker *) &POSE_Objects)[i].insert(wd, dest);
   }
+  POSE_Objects.doneInserting();
 }
 
 void main::buildMap(int numObjs, int dist)
index 5971b0ddfe7f93544baa54b75dcbfa15bde58559..81bfeb72a1d8fd47947ea312663dda1ae800a676 100644 (file)
@@ -26,7 +26,7 @@ include ../Makefile.common
 # *************************
 PGM_MODULE=Pgm
 PGM=pgm
-OTHER=-lconv-bluegene-logs
+OTHER=-lconv-bigsim-logs
 LIBS=-Lstdc++ -lm
 #LIBS=/expand8/home/guna/charm/src/langs/bluegene/blue_seq.o
 
index ca9acab2540b7a351b7c03054107ee2662872aae..f738b7f701e6419f13ff52e6114370236f21ed4f 100644 (file)
@@ -1,6 +1,6 @@
-#include "blue.h"
+#include "bigsim.h"
 #include "blue_impl.h"
-#include "blue_logs.h"
+#include "bigsim_logs.h"
 #include "trace-projections.h"
 
 #define  yourUniqueTaskIDtype TaskID*
index 1e8442ceeaa3eb65331570ba55612ff6ec8d830c..f5567136133ddb6f541c328824e51a57ace9c33f 100644 (file)
@@ -39,7 +39,7 @@ MAINDIR = ./
 SUBDIRS = $(MAINDIR) $(ROUTINGDIR) $(TOPOLOGYDIR) $(VCSELECTIONDIR)
 SIM_OBJECTS=BgSim_sim.o TCsim_sim.o $(PGM).o  util.o
 PGM = pgm
-OTHER = -lconv-bluegene-logs
+OTHER = -lconv-bigsim-logs
 LIBS = -Lstdc++ -lm
 
 all:
index 4343a68a942b860431e035840aefdef636b81d0f..74bb62a6ceab8604b7f29509115731f1f487c0d6 100644 (file)
@@ -36,6 +36,7 @@ main::main(CkArgMsg *m) {
     sd->Timestamp(0);
     (*(CProxy_schedulerObject *) &POSE_Objects)[i].insert(sd);
   }
+    POSE_Objects.doneInserting();
 }
 
 
index 0895cdcb55b471d659b650406a5230682a60265a..748df6797b20dae2ecf3ac2d547f799b9fd39677 100644 (file)
@@ -134,4 +134,4 @@ seqtrans: Node.C Node.h Node.ci
        $(CHARMBIN)/etrans.pl -s Node
 
 test:
-       ./pgm
+       ./mininet
index d51720b989b604eb4a785eb003429fa3b453c098..b5f37006faeef20a1890bba31686991cc2d69660 100644 (file)
@@ -25,4 +25,5 @@ main::main(CkArgMsg *m)
     nm->Timestamp(0);
     (*(CProxy_Node *) &POSE_Objects)[i].insert(nm);
   }
+  POSE_Objects.doneInserting();
 }
index a5f42a38d88c5482898bf221cb01d12fcd618697..8eb063c22c244f35382aedcc4f58ce04f4366ca9 100644 (file)
@@ -82,6 +82,7 @@ main::main(CkArgMsg *m)
     wd->Timestamp(0);
     (*(CProxy_worker *) &POSE_Objects)[i].insert(wd, dest);
   }
+  POSE_Objects.doneInserting();
 }
 
 void main::buildMap(int numLPs, int dist)
index 7ec3d290557da53f6705b1553d77155f32ae910b..fe298fbeec9839b70b659a4adaf906cc5163d19a 100644 (file)
@@ -116,5 +116,6 @@ Worker.def.h Worker.decl.h : Worker_sim.ci
 Worker_sim.C Worker_sim.h Worker_sim.ci: Worker.C Worker.h Worker.ci 
        $(CHARMBIN)/etrans.pl Worker
 
-test:
-       ./pgm 1000 10 1 RANDOM SPARSE 50 50 -gf 344
+test: $(PGM)
+       ./pgm 20 200 MEDIUM -gm 10
+
index 89beff1babc97f50dc8feb75aa50d54ba5dba9a9..7ac323f1557639a3cbb5f6a4d615aa842429920e 100644 (file)
@@ -71,7 +71,7 @@ main::main(CkArgMsg *m)
   CkArrayOptions opts(totalObjs);
   opts.setMap(myMap);
   (*(CProxy_worker *) &POSE_Objects) = CProxy_worker::ckNew(wd, opts);
-
+  POSE_Objects.doneInserting();
   /*
   // create all the workers
   WorkerData *wd;
index 97ea58d396ee443c34237fe62f54ef1418c46e76..680c0148cb0fbe1110a35961e7c7a59430f1c1c5 100644 (file)
@@ -116,5 +116,5 @@ Worker.def.h Worker.decl.h : Worker_sim.ci
 Worker_sim.C Worker_sim.h Worker_sim.ci: Worker.C Worker.h Worker.ci 
        $(CHARMBIN)/etrans.pl Worker
 
-test:
+test: $(PGM)
        ./pgm 1000 100 SMALL 50 -gf 200
index 3fbbb2561c38485555d081fc7ceca5532f701fa2..75038daa8745be28d12fe961bc91fba135707c0a 100644 (file)
@@ -14,7 +14,7 @@ main::main(CkArgMsg *m)
   double granularity=-1.0;
   char grainString[20];
   char *text;
-
+  POSE_init();
   if(m->argc<7) {
     CkPrintf("Usage: simb <#objsPerProc> <#msgsPerObj> <msgSize(MIXED,SMALL,MEDIUM,LARGE)> <locality(%)> [ -g[f|m|c|z] | -t<granularity> ] <density(msgsPerVTU)>\n");
     CkExit();
@@ -55,7 +55,7 @@ main::main(CkArgMsg *m)
 
   CkPrintf(">>> ...Objects communicate locally %d%% of the time...\n>>> ...Each event has %s granularity of %f on average...\n>>> ...Events are concentrated at approximately %d per Virtual Time Unit(VTU).\n", locality, text, granularity, density);
 
-  POSE_init();
+
 
   // create all the workers
   WorkerData *wd;
@@ -77,6 +77,7 @@ main::main(CkArgMsg *m)
     //wd->dump();
     (*(CProxy_worker *) &POSE_Objects)[i].insert(wd, dest);
   }
+  POSE_Objects.doneInserting();
 }
 
 void main::buildMap(int numObjs, int dist)