[C-MPI-commits] SF.net SVN: c-mpi:[200]

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

Revision: 200
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=200&view=rev
Author:   jmwozniak
Date:     2011-05-02 15:06:20 +0000 (Mon, 02 May 2011)

Log Message:
-----------
Get test-startup working for dense-1 and kda-2A

Modified Paths:
--------------
    include/cmpi.h
    include/list.h
    src/adts/list.c
    src/dense-1/dense.c
    src/mpirpc/mpirpc.c
    test/cmpi/module.mk.in
    test/cmpi/test-startup.c
    test/cmpi/test-tables.c

Modified: include/cmpi.h
===================================================================
--- include/cmpi.h	2011-05-02 15:04:43 UTC (rev 199)
+++ include/cmpi.h	2011-05-02 15:06:20 UTC (rev 200)
@@ -229,7 +229,7 @@
                         int offset, int length);
 
 /**
-   Global operation.  Instruct all nodes to shutdown.
+   Instruct all nodes to shutdown.  All clients need to call this.
 */
 void cmpi_shutdown(void);
 

Modified: include/list.h
===================================================================
--- include/list.h	2011-05-02 15:04:43 UTC (rev 199)
+++ include/list.h	2011-05-02 15:06:20 UTC (rev 200)
@@ -113,7 +113,7 @@
 /**
    Return the head data item.
 */
-void* list_peek(struct list* target);
+void* list_head(struct list* target);
 
 /**
    Remove and return the head data item.

Modified: src/adts/list.c
===================================================================
--- src/adts/list.c	2011-05-02 15:04:43 UTC (rev 199)
+++ src/adts/list.c	2011-05-02 15:06:20 UTC (rev 200)
@@ -138,7 +138,7 @@
 }
 
 void*
-list_peek(struct list* target)
+list_head(struct list* target)
 {
   if (target->size == 0)
     return NULL;

Modified: src/dense-1/dense.c
===================================================================
--- src/dense-1/dense.c	2011-05-02 15:04:43 UTC (rev 199)
+++ src/dense-1/dense.c	2011-05-02 15:06:20 UTC (rev 200)
@@ -92,10 +92,10 @@
   }
   else
   {
-    int client =
-      cmpi_mode_first_client(mpi_rank, mpi_size, dense_nodes);
-    NOTE("NOTIFYING");
-    int msg = -2;
+    //int client =
+    //  cmpi_mode_first_client(mpi_rank, mpi_size, dense_nodes);
+    //NOTE("NOTIFYING");
+    //int msg = -2;
     // MPI_Send(&msg, 1, MPI_INT, client, 0, MPI_COMM_WORLD);
   }
 }
@@ -225,6 +225,7 @@
 void
 DENSE_Shutdown(MPIRPC_Node node)
 {
+  NOTE_F;
   MPIRPC_Block(node, "quit", NULL);
 }
 
@@ -333,6 +334,7 @@
 
 static MPIRPC_Handler(handle_quit)
 {
+  NOTE_F;
   MPIRPC_Null(caller, unique);
   sleep(1);
   MPIRPC_Flush_returns();

Modified: src/mpirpc/mpirpc.c
===================================================================
--- src/mpirpc/mpirpc.c	2011-05-02 15:04:43 UTC (rev 199)
+++ src/mpirpc/mpirpc.c	2011-05-02 15:06:20 UTC (rev 200)
@@ -689,7 +689,7 @@
   MPI_Status    status;
   int           sent;
 
-  value = list_peek(garbage_values);
+  value = list_head(garbage_values);
   if (!value)
     return false;
 

Modified: test/cmpi/module.mk.in
===================================================================
--- test/cmpi/module.mk.in	2011-05-02 15:04:43 UTC (rev 199)
+++ test/cmpi/module.mk.in	2011-05-02 15:06:20 UTC (rev 200)
@@ -12,20 +12,24 @@
 
 TEST_HELPER_SRC := test/cmpi/test_helpers.c
 TEST_CMPI_OBJS  += $(patsubst %.c, %.o,   $(TEST_HELPER_SRC))
+TEST_CMPI_PROGS := $(patsubst %.c, %.x, $(TEST_CMPI_SRC))
 
 TEST_SRC    += $(TEST_CMPI_SRC)
 TEST_OBJS   += $(TEST_CMPI_OBJS)
-TEST_PROGS  += $(patsubst %.c, %.x, $(TEST_CMPI_SRC))
+TEST_PROGS  += $(TEST_CMPI_PROGS)
 TEST_OUTPUT += $(TEST_CMPI_OUTPUT)
 
+
 ifeq (@USE_CMPI_MODE@,MONO)
-	NODES := 5
-	CLIENTS := 1
+  NODES := 5
+  CLIENTS := 1
 else
-	NODES := 3
-	CLIENTS := 3
+  NODES := 3
+  CLIENTS := 3
 endif
 
+cmpi_tests: $(TEST_CMPI_PROGS)
+
 ifeq (@USE_COMM_WORLD@,1)
 
 $(DIR)/test%.x: $(DIR)/test%.o $(DIR)/test_helpers.o src/cmpi/node.o $(CMPI)

Modified: test/cmpi/test-startup.c
===================================================================
--- test/cmpi/test-startup.c	2011-05-02 15:04:43 UTC (rev 199)
+++ test/cmpi/test-startup.c	2011-05-02 15:06:20 UTC (rev 200)
@@ -24,6 +24,5 @@
 
   puts("running...");
 
-  // if (mpi_rank == mpi_size-1)
   cmpi_shutdown();
 }

Modified: test/cmpi/test-tables.c
===================================================================
--- test/cmpi/test-tables.c	2011-05-02 15:04:43 UTC (rev 199)
+++ test/cmpi/test-tables.c	2011-05-02 15:06:20 UTC (rev 200)
@@ -16,13 +16,15 @@
 
   gossip_set_debug_mask(1, MASK_MPIRPC|MASK_DHT);
 
-  wait_for_notification();
-  notify_next();
+  // wait_for_notification();
+  // notify_next();
 
+  sleep(2);
+
   cmpi_debug_tables();
 
   sleep(mpi_rank);
 
-  //if (mpi_rank == mpi_size-1)
-  cmpi_shutdown();
+  if (mpi_rank == mpi_size-1)
+    cmpi_shutdown();
 }


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