Merge branch 'charm' of charmgit:charm into charm
authorAbhishek Gupta <gupta59@illinois.edu>
Sun, 31 Oct 2010 09:37:26 +0000 (04:37 -0500)
committerAbhishek Gupta <gupta59@illinois.edu>
Sun, 31 Oct 2010 09:37:26 +0000 (04:37 -0500)
src/arch/mpi-linux-x86_64/conv-mach-smp.h
src/ck-com/ComlibSectionInfo.C
src/ck-perf/trace-common.C

index df0b2327c0eeb6a930e107855cd00aa0d6ba518c..d151c6de355011430d9fd2abde8603243d35ef2b 100644 (file)
@@ -15,8 +15,8 @@
 
 #undef CMK_MALLOC_USE_GNU_MALLOC
 #undef CMK_MALLOC_USE_OS_BUILTIN
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
+#define CMK_MALLOC_USE_GNU_MALLOC                          1
+#define CMK_MALLOC_USE_OS_BUILTIN                          0
 
 /*#define  CMK_USE_MFENCE                                    1 */
 /*#define  CMK_PCQUEUE_LOCK                                  1 */
index dffda71fbb23014577cf45c1160885416bfb8609..db5682d97fed25fe40a84ec8005a8764515971d4 100644 (file)
@@ -198,6 +198,7 @@ void ComlibSectionInfo::processOldSectionMessage(CharmMessageHolder *cmsg) {
 
     //Old section id, send the id with the message
     CkMcastBaseMsg *cbmsg = (CkMcastBaseMsg *)cmsg->getCharmMessage();
+    cbmsg->_cookie.pe = CkMyPe();
     cbmsg->_cookie.sInfo.cInfo.id = cur_sec_id;
     cbmsg->_cookie.sInfo.cInfo.status = COMLIB_MULTICAST_OLD_SECTION;
 }
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