[PATCH] blktrace: make sendfile usage the default

diff --git a/README b/README
index 4c6d1f7c75bea73e9398a08550419dba5cf6d451..37e6b655f7a5910ffd1cac47b7b4ddc5d8f3fef6 100644 (file)
--- a/README
+++ b/README
@@ -65,7 +65,7 @@ $ blktrace -d <dev> [ -r relay_path ] [ -o output ] [ -k ] [ -w time ]
        -l Run in network listen mode (blktrace server)
        -h Run in network client mode, connecting to the given host
        -p Network port to use (default 8462)
-       -s Make the network client use sendfile() to transfer data
+       -s Disable network client use of sendfile() to transfer data
        -V Print program version info.
 
 $ blkparse -i <input> [ -o <output> ] [ -b rb_batch ] [ -s ] [ -t ] [ -q ]

diff --git a/blktrace.c b/blktrace.c
index 83298d19088ea27f204b0f96595fe53153df0784..47b4d3f4aa66f00ae9717926d438a0fe2bbb8154 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -146,7 +146,7 @@ static struct option l_opts[] = {
                .val = 'p'
        },
        {
-               .name = "sendfile",
+               .name = "no-sendfile",
                .has_arg = no_argument,
                .flag = NULL,
                .val = 's'
@@ -292,7 +292,7 @@ enum {
 static char hostname[MAXHOSTNAMELEN];
 static int net_port = TRACE_NET_PORT;
 static int net_mode = 0;
-static int net_use_sendfile;
+static int net_use_sendfile = 1;
 
 struct net_connection {
        int in_fd;
@@ -1730,7 +1730,7 @@ int main(int argc, char *argv[])
                        net_port = atoi(optarg);
                        break;
                case 's':
-                       net_use_sendfile = 1;
+                       net_use_sendfile = 0;
                        break;
                default:
                        show_usage(argv[0]);