[mpich2-commits] r4205 - mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module

[buntinas at mcs.anl.gov]

Author: buntinas
Date: 2009-03-26 15:30:13 -0500 (Thu, 26 Mar 2009)
New Revision: 4205

Modified:
   mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_init.c
   mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_send.c
Log:
merged r3982 from 1_0 branch: fixed gm compile error reported in ticket #429

Modified: mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_init.c
===================================================================
--- mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_init.c	2009-03-26 19:46:57 UTC (rev 4204)
+++ mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_init.c	2009-03-26 20:30:13 UTC (rev 4205)
@@ -249,11 +249,23 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
 int
-MPID_nem_gm_module_vc_init (MPIDI_VC_t *vc, const char *business_card)
+MPID_nem_gm_module_vc_init (MPIDI_VC_t *vc)
 {    
+    char *business_card;
     int mpi_errno = MPI_SUCCESS;
     int ret;
-
+    int pmi_errno;
+    int val_max_sz;
+    MPIU_CHKLMEM_DECL(1);
+    
+    pmi_errno = PMI_KVS_Get_value_length_max(&val_max_sz);
+    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, "business_card");
+    
+    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 */
 
     mpi_errno = MPID_nem_gm_module_get_port_unique_from_bc (business_card, &VC_FIELD(vc, gm_port_id), VC_FIELD(vc, gm_unique_id));
@@ -269,6 +281,7 @@
     /* --END ERROR HANDLING-- */
 
  fn_fail:
+    MPIU_CHKLMEM_FREEALL()
     return mpi_errno;
 }
 

Modified: mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_send.c
===================================================================
--- mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_send.c	2009-03-26 19:46:57 UTC (rev 4204)
+++ mpich2/branches/release/MPICH2_1_0_8/src/mpid/ch3/channels/nemesis/nemesis/net_mod/gm_module/gm_module_send.c	2009-03-26 20:30:13 UTC (rev 4205)
@@ -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;
 }