Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Sat, 30 Oct 2010 22:46:13 +0000 (17:46 -0500)
committerChao Mei <chaomei2@illinois.edu>
Sat, 30 Oct 2010 22:46:13 +0000 (17:46 -0500)
src/ck-perf/trace-common.C

index b01252ba0a6017ff2875189e817d62d47cbae166..f7fce32fd81d4963f6463f845702da7d1e1c319e 100644 (file)
@@ -175,8 +175,10 @@ static void traceCommonInit(char **argv)
 extern void traceWriteSTS(FILE *stsfp,int nUserEvents) {
   fprintf(stsfp, "MACHINE %s\n",CMK_MACHINE_NAME);
 #if CMK_SMP_TRACE_COMMTHREAD
+  //Assuming there's only 1 comm thread now! --Chao Mei
   //considering the extra comm thread per node
-  fprintf(stsfp, "PROCESSORS %d\n", CkNumPes()+CkNumNodes());
+  fprintf(stsfp, "PROCESSORS %d\n", CkNumPes()+CkNumNodes());  
+  fprintf(stsfp, "SMPMODE %d %d\n", CkMyNodeSize(), CkNumNodes());
 #else  
   fprintf(stsfp, "PROCESSORS %d\n", CkNumPes());
 #endif