From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 31 Jan 2013 09:19:51 +0000 (+0100)
Subject: configure: add TCP_NODELAY check
X-Git-Tag: fio-2.0.14~53
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=1eafa37ac57bb08ca21af8ab76bd7848ae2e7c97

configure: add TCP_NODELAY check

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/configure b/configure
index 995b5df2..d332c5eb 100755
--- a/configure
+++ b/configure
@@ -201,6 +201,7 @@ CYGWIN*)
   output_sym "CONFIG_GETTIMEOFDAY"
   output_sym "CONFIG_CLOCK_GETTIME"
   output_sym "CONFIG_SCHED_IDLE"
+  output_sym "CONFIG_TCP_NODELAY"
   echo "CC=$CC" >> $config_host_mak
   echo "EXTFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
   exit 0
@@ -861,6 +862,24 @@ if compile_prog "" "" "SCHED_IDLE"; then
 fi
 echo "SCHED_IDLE                    $sched_idle"
 
+##########################################
+# Check whether we have TCP_NODELAY
+tcp_nodelay="no"
+cat > $TMPC << EOF
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+int main(int argc, char **argv)
+{
+  return getsockopt(0, 0, TCP_NODELAY, NULL, NULL);
+}
+EOF
+if compile_prog "" "" "TCP_NODELAY"; then
+  tcp_nodelay="yes"
+fi
+echo "TCP_NODELAY                   $tcp_nodelay"
+
 #############################################################################
 
 echo "# Automatically generated by configure - do not modify" > $config_host_mak
@@ -967,6 +986,9 @@ fi
 if test "$sched_idle" = "yes" ; then
   output_sym "CONFIG_SCHED_IDLE"
 fi
+if test "$tcp_nodelay" = "yes" ; then
+  output_sym "CONFIG_TCP_NODELAY"
+fi
 
 echo "LIBS+=$LIBS" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
diff --git a/engines/net.c b/engines/net.c
index d0f4fa0d..3e03bc9c 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -92,12 +92,14 @@ static struct fio_option options[] = {
 			  },
 		},
 	},
+#ifdef CONFIG_TCP_NODELAY
 	{
 		.name	= "nodelay",
 		.type	= FIO_OPT_BOOL,
 		.off1	= offsetof(struct netio_options, nodelay),
 		.help	= "Use TCP_NODELAY on TCP connections",
 	},
+#endif
 	{
 		.name	= "listen",
 		.type	= FIO_OPT_STR_SET,
@@ -479,6 +481,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
 		return 1;
 	}
 
+#ifdef CONFIG_TCP_NODELAY
 	if (o->nodelay && o->proto == FIO_TYPE_TCP) {
 		optval = 1;
 		if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
@@ -486,6 +489,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
 			return 1;
 		}
 	}
+#endif
 
 	if (o->proto == FIO_TYPE_UDP)
 		return 0;
@@ -539,6 +543,7 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
 		goto err;
 	}
 
+#ifdef CONFIG_TCP_NODELAY
 	if (o->nodelay && o->proto == FIO_TYPE_TCP) {
 		optval = 1;
 		if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
@@ -546,6 +551,7 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
 			return 1;
 		}
 	}
+#endif
 
 	reset_all_stats(td);
 	td_set_runstate(td, state);