From cb31187bbe4db99610d82d0d2713b80b0f39d69d Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 8 Jan 2014 15:12:50 +0000 Subject: [PATCH] Correct tcp_not_use_nodelay option processing - change in mca param system incorrectly reversed the original parameter Thanks to Tetsuya Mishima for detecting it! cmr=v1.7.4:reviewer=jsquyres:subject=Correct tcp_not_use_nodelay option processing This commit was SVN r30157. --- ompi/mca/btl/tcp/btl_tcp_endpoint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ompi/mca/btl/tcp/btl_tcp_endpoint.c b/ompi/mca/btl/tcp/btl_tcp_endpoint.c index f966338878..f21fc1c70b 100644 --- a/ompi/mca/btl/tcp/btl_tcp_endpoint.c +++ b/ompi/mca/btl/tcp/btl_tcp_endpoint.c @@ -10,7 +10,8 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007-2008 Sun Microsystems, Inc. All rights reserved. - * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -531,9 +532,9 @@ static int mca_btl_tcp_endpoint_recv_connect_ack(mca_btl_base_endpoint_t* btl_en void mca_btl_tcp_set_socket_options(int sd) { - int optval; #if defined(TCP_NODELAY) - optval = mca_btl_tcp_component.tcp_not_use_nodelay; + int optval; + optval = !mca_btl_tcp_component.tcp_not_use_nodelay; if(setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (char *)&optval, sizeof(optval)) < 0) { BTL_ERROR(("setsockopt(TCP_NODELAY) failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno));