[C-MPI-commits] SF.net SVN: c-mpi:[137] test/cmpi-db

[<jmw...@us...>]

Revision: 137
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=137&view=rev
Author:   jmwozniak
Date:     2010-05-20 23:58:01 +0000 (Thu, 20 May 2010)

Log Message:
-----------
Improving DMALLOC usage

Modified Paths:
--------------
    include/mpi_tools.h
    src/cmpi/node.c
    src/cmpi-db/cmpi-db-fifo.c
    src/mpi_tools/mpi_tools.c
    test/adts/test-lru_table01.c
    test/adts/test_helpers.h
    test/cmpi-db/test-cp1.zsh

Modified: include/mpi_tools.h
===================================================================
--- include/mpi_tools.h	2010-05-20 20:53:01 UTC (rev 136)
+++ include/mpi_tools.h	2010-05-20 23:58:01 UTC (rev 137)
@@ -346,6 +346,15 @@
 #define dmalloc_setup(x)
 #endif
 
+#define DMALLOC_COMPLETE                              \
+  DMALLOC_SETUP(                                      \
+    {                                                 \
+      SHOW_S(dmalloc_logpath);                        \
+      dmalloc_shutdown();                             \
+      /* free(dmalloc_logpath); */                    \
+      dmalloc_log_unfreed();                          \
+    });
+
 /**
    Return a number in [0,n-1].
 */

Modified: src/cmpi/node.c
===================================================================
--- src/cmpi/node.c	2010-05-20 20:53:01 UTC (rev 136)
+++ src/cmpi/node.c	2010-05-20 23:58:01 UTC (rev 137)
@@ -168,7 +168,7 @@
     DEBUG(timestamp("START", NULL));
   }
 
-  DMALLOC_SETUP(dmalloc_setup());
+  dmalloc_setup();
 
   // Handle and store options...
   options(argc, argv);
@@ -195,8 +195,8 @@
     exit(1);
   }
 
-  if (cmpi_mode_select(mpi_rank, mpi_size, cmpi_nodes) ==
-      CMPI_MODE_NODE)
+  int mode = cmpi_mode_select(mpi_rank, mpi_size, cmpi_nodes);
+  if (mode == CMPI_MODE_NODE)
   {
     NOTE("I am node");
     printf("node: %i @ %s\n", mpi_rank, hostname);
@@ -218,12 +218,12 @@
 
 #endif
 
-  NOTE("MPI_Finalize()...");
+  // NOTE("MPI_Finalize()...");
   MPI_Finalize();
 
 #if USE_COMM_WORLD == 1
 
-  if (mpi_rank < cmpi_nodes)
+  if (mode == CMPI_MODE_NODE)
     cmpi_cleanup();
   else
     cmpi_client_cleanup();
@@ -234,9 +234,12 @@
 
 #endif
 
-  DMALLOC_SETUP(if (mpi_rank == 0)
+
+  DMALLOC_SETUP(// if (mpi_rank == 0)
                 { NOTE("DMALLOC_SHUTDOWN");
+                  SHOW_S(dmalloc_logpath);
                   dmalloc_shutdown();
+                  dmalloc_log_unfreed();
                 });
 
   NOTE("Normal exit.");

Modified: src/cmpi-db/cmpi-db-fifo.c
===================================================================
--- src/cmpi-db/cmpi-db-fifo.c	2010-05-20 20:53:01 UTC (rev 136)
+++ src/cmpi-db/cmpi-db-fifo.c	2010-05-20 23:58:01 UTC (rev 137)
@@ -38,8 +38,12 @@
 {
   char hostname[128];
 
+  char* s = getenv("DMALLOC_OPTIONS");
+
   NOTE("CMPI-DB-FIFO...");
 
+  printf("DO: %s\n", s);
+
   wait_for_notification();
   notify_next();
 

Modified: src/mpi_tools/mpi_tools.c
===================================================================
--- src/mpi_tools/mpi_tools.c	2010-05-20 20:53:01 UTC (rev 136)
+++ src/mpi_tools/mpi_tools.c	2010-05-20 23:58:01 UTC (rev 137)
@@ -466,7 +466,7 @@
   dmalloc_logpath = malloc(100);
   assert(dmalloc_logpath != NULL);
   sprintf(dmalloc_logpath, "./dmalloc_%i.out", debug_rank);
-  printf("dmalloc_logpath: %s \n", dmalloc_logpath);
+  SHOW_S(dmalloc_logpath);
   fflush(NULL);
 }
 #endif

Modified: test/adts/test-lru_table01.c
===================================================================
--- test/adts/test-lru_table01.c	2010-05-20 20:53:01 UTC (rev 136)
+++ test/adts/test-lru_table01.c	2010-05-20 23:58:01 UTC (rev 137)
@@ -15,10 +15,7 @@
   MPI_Init(&argc, &argv);
   whoami();
 
-#ifdef DMALLOC
-  sprintf(dmalloc_logpath, "./dmalloc_%i.out", debug_rank);
-  printf("DMALLOC_PATH: %s \n", dmalloc_logpath);
-#endif
+  dmalloc_setup();
 
   struct lru_table* table = lru_table_create(5, 4);
 
@@ -175,7 +172,8 @@
   // dmalloc_shutdown();
 
   MPI_Finalize();
-  return 0;
-}
 
+  DMALLOC_COMPLETE;
 
+  return 0;
+}

Modified: test/adts/test_helpers.h
===================================================================
--- test/adts/test_helpers.h	2010-05-20 20:53:01 UTC (rev 136)
+++ test/adts/test_helpers.h	2010-05-20 23:58:01 UTC (rev 137)
@@ -2,7 +2,6 @@
 #define TEST_DMALLOC                                  \
   DMALLOC_SETUP(                                      \
     {                                                 \
-      printf("HOWDY\n");                              \
       SHOW_S(dmalloc_logpath);                        \
       dmalloc_shutdown();                             \
       /* free(dmalloc_logpath); */                    \

Modified: test/cmpi-db/test-cp1.zsh
===================================================================
--- test/cmpi-db/test-cp1.zsh	2010-05-20 20:53:01 UTC (rev 136)
+++ test/cmpi-db/test-cp1.zsh	2010-05-20 23:58:01 UTC (rev 137)
@@ -8,6 +8,8 @@
 NODES=$2
 CLIENTS=$3
 
+[[ ${OUTPUT} == "" ]] && print "Bad args!" && exit 1
+
 TOTAL=$(( NODES+CLIENTS ))
 
 source tools/test-helpers.zsh
@@ -15,7 +17,7 @@
 mpiexec -n ${TOTAL} bin/cmpi-db -n ${NODES} >& ${OUTPUT} &
 DB_PID=${!}
 
-tools/timebomb.zsh ${DB_PID} $(( TOTAL*4 )) ${OUTPUT} $0 &
+tools/timebomb.zsh ${DB_PID} $(( TOTAL*40 )) ${OUTPUT} $0 &
 BOMB_PID=${!}
 
 sleep ${TOTAL}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.