From 675dccf9d9eb6514a5b0a0cdac797dbd1da7f928 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Fri, 15 May 2015 00:14:28 -0400 Subject: [PATCH 1/2] Print the port in host byte order. --- opal/mca/btl/tcp/btl_tcp_endpoint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/mca/btl/tcp/btl_tcp_endpoint.c b/opal/mca/btl/tcp/btl_tcp_endpoint.c index 6c0a810c25..e2676ef40e 100644 --- a/opal/mca/btl/tcp/btl_tcp_endpoint.c +++ b/opal/mca/btl/tcp/btl_tcp_endpoint.c @@ -766,14 +766,14 @@ static int mca_btl_tcp_endpoint_start_connect(mca_btl_base_endpoint_t* btl_endpo return OPAL_SUCCESS; } } - btl_endpoint->endpoint_retries++; + { char *address; address = opal_net_get_hostname((struct sockaddr*) &endpoint_addr); BTL_PEER_ERROR( btl_endpoint->endpoint_proc->proc_opal, ( "Unable to connect to the peer %s on port %d: %s\n", address, - btl_endpoint->endpoint_addr->addr_port, strerror(opal_socket_errno) ) ); + ntohs(btl_endpoint->endpoint_addr->addr_port), strerror(opal_socket_errno) ) ); } btl_endpoint->endpoint_state = MCA_BTL_TCP_FAILED; mca_btl_tcp_endpoint_close(btl_endpoint); From c05b271c68672c9e456e7370a01d6549dba767bd Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 15 May 2015 16:02:01 +0900 Subject: [PATCH 2/2] man: fix a trivial typo in MPI_Neighbor_allgather.3in --- ompi/mpi/man/man3/MPI_Neighbor_allgather.3in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mpi/man/man3/MPI_Neighbor_allgather.3in b/ompi/mpi/man/man3/MPI_Neighbor_allgather.3in index cda5a0fd31..eb77e457e2 100644 --- a/ompi/mpi/man/man3/MPI_Neighbor_allgather.3in +++ b/ompi/mpi/man/man3/MPI_Neighbor_allgather.3in @@ -31,7 +31,7 @@ MPI_NEIGHBOR_ALLGATHER(\fISENDBUF\fP,\fI SENDCOUNT\fP,\fI SENDTYPE\fP,\fI RECVBU INTEGER \fISENDCOUNT\fP,\fI SENDTYPE\fP,\fI RECVCOUNT\fP,\fI RECVTYPE\fP,\fI COMM\fP, INTEGER \fIIERROR\fP -MPI_NEIGHBOR_ALLGATHER(\fISENDBUF\fP,\fI SENDCOUNT\fP,\fI SENDTYPE\fP,\fI RECVBUF\fP,\fI RECVCOUNT\fP,\fI +MPI_INEIGHBOR_ALLGATHER(\fISENDBUF\fP,\fI SENDCOUNT\fP,\fI SENDTYPE\fP,\fI RECVBUF\fP,\fI RECVCOUNT\fP,\fI RECVTYPE\fP,\fI COMM\fP, \fPREQUEST\fI,\fI IERROR\fP) \fISENDBUF\fP (*), \fIRECVBUF\fP (*) INTEGER \fISENDCOUNT\fP,\fI SENDTYPE\fP,\fI RECVCOUNT\fP,\fI RECVTYPE\fP,\fI COMM\fP,