All pastes #2104164 Raw Edit

clueless

public diff v1 · immutable
#2104164 ·published 2012-01-19 20:46 UTC
rendered paste body
Index: src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c===================================================================--- src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c	(revision 9452)+++ src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c	(working copy)@@ -217,7 +217,7 @@ fn_fail:  *  * We return the following items:  *- *    ifname - name of the interface.  This may or may not be the same+ *    ifname - hostname of the interface.  This may or may not be the same  *             as the name returned by gethostname  (in Unix)  *    ifaddr - This structure includes the interface IP address (as bytes),  *             and the type (e.g., AF_INET or AF_INET6).  Only @@ -238,12 +238,17 @@ static int GetSockInterfaceAddr(int myRank, char *      /* Check if user specified ethernet interface name, e.g., ib0, eth1 */     if (MPIR_PARAM_NETWORK_IFACE) {+	int len;         mpi_errno = MPIDI_Get_IP_for_iface(MPIR_PARAM_NETWORK_IFACE, ifaddr, &ifaddrFound);         MPIU_ERR_CHKANDJUMP1(mpi_errno || !ifaddrFound, mpi_errno, MPI_ERR_OTHER, "**iface_notfound", "**iface_notfound %s", MPIR_PARAM_NETWORK_IFACE);                  MPIU_DBG_MSG_FMT(CH3_CONNECT, VERBOSE, (MPIU_DBG_FDEST,                                                 "ifaddrFound=TRUE ifaddr->type=%d ifaddr->len=%d ifaddr->ifaddr[0-3]=%#08x",                                                 ifaddr->type, ifaddr->len, *((unsigned int *)ifaddr->ifaddr)));++        /* In this case, ifname is only used for debugging purposes */+	mpi_errno = MPID_Get_processor_name(ifname, maxIfname, &len );+        if (mpi_errno) MPIU_ERR_POP(mpi_errno);         goto fn_exit;     }