[mpich2-commits] r4131 - mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm

[goodell at mcs.anl.gov]

Author: goodell
Date: 2009-03-19 15:50:57 -0500 (Thu, 19 Mar 2009)
New Revision: 4131

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_init.c
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_send.c
Log:
Fixed gm compile error from ticket #478.

See also r3982 and ticket #429.

Reviewed by buntinas at .

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_init.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_init.c	2009-03-19 06:34:27 UTC (rev 4130)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_init.c	2009-03-19 20:50:57 UTC (rev 4131)
@@ -268,6 +268,7 @@
     int mpi_errno = MPI_SUCCESS;
     int ret;
     char *business_card;
+    int pmi_errno;
     int val_max_sz;
     MPIU_CHKLMEM_DECL(1);
 
@@ -276,7 +277,7 @@
     MPIU_ERR_CHKANDJUMP1(pmi_errno, mpi_errno, MPI_ERR_OTHER, "**fail", "**fail %d", pmi_errno);
     MPIU_CHKLMEM_MALLOC(business_card, char *, val_max_sz, mpi_errno, "bc");
 
-    mpi_errno = vc->pg->getConnInfo(vc->pg_rank, business_card, key_max_sz, vc->pg);
+    mpi_errno = vc->pg->getConnInfo(vc->pg_rank, business_card, val_max_sz, vc->pg);
     if (mpi_errno) MPIU_ERR_POP(mpi_errno);
 
     VC_FIELD(vc, source_id) = my_pg_rank; /* FIXME: this is only valid for processes in COMM_WORLD */

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_send.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_send.c	2009-03-19 06:34:27 UTC (rev 4130)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_send.c	2009-03-19 20:50:57 UTC (rev 4131)
@@ -13,8 +13,6 @@
 {
     MPID_nem_cell_t *cell = (MPID_nem_cell_t *)context;
 
-    printf_d ("send_callback()\n");
-
     if (status != GM_SUCCESS)
     {
 	gm_perror ("Send error", status);
@@ -39,8 +37,6 @@
     gm_send_with_callback (MPID_nem_module_gm_port, pkt, PACKET_SIZE, datalen + MPID_NEM_MPICH2_HEAD_LEN, GM_LOW_PRIORITY, node_id,
 			   port_id, send_callback, (void *)cell);
     DO_PAPI (PAPI_accum_var (PAPI_EventSet, PAPI_vvalues4));
-    printf_d ("  Sent packet to node = %d, port = %d\n", node_id, port_id);
-    printf_d ("    datalen %d\n", datalen);
     return MPI_SUCCESS;
 }