[PATCH] vmsplice2: warning fix

[splice.git] / splice-net.c

diff --git a/splice-net.c b/splice-net.c
index f8ba43ba5a607b61132dd9efc53c7a1bb8fd1e4e..2c117d9d379d7f6205becfcba693302b7cb7442d 100644 (file)
--- a/splice-net.c
+++ b/splice-net.c
@@ -12,138 +12,64 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <sys/time.h>
+#include <errno.h>
 
 #include "splice.h"
 
-static struct timeval start_time;
-static unsigned long long kb_sent;
-static unsigned long iters;
-
-static unsigned long mtime_since(struct timeval *s, struct timeval *e)
-{
-        double sec, usec;
-
-        sec = e->tv_sec - s->tv_sec;
-        usec = e->tv_usec - s->tv_usec;
-        if (sec > 0 && usec < 0) {
-                sec--;
-                usec += 1000000;
-        }
-
-        sec *= (double) 1000;
-        usec /= (double) 1000;
-
-        return sec + usec;
-}
-
-static unsigned long mtime_since_now(struct timeval *s)
-{
-        struct timeval t;
-
-        gettimeofday(&t, NULL);
-        return mtime_since(s, &t);
-}
-
-void show_rate(int sig)
+static int usage(char *name)
 {
-       unsigned long msecs = mtime_since_now(&start_time);
-
-       printf("Throughput: %LuMiB/sec (%Lu MiB in %lu msecs)\n", kb_sent / msecs, kb_sent, msecs);
-       printf("avg put: %Lu\n", kb_sent / iters);
+       fprintf(stderr, "%s: target port\n", name);
+       return 1;
 }
 
 int main(int argc, char *argv[])
 {
        struct sockaddr_in addr;
        unsigned short port;
-       int fd, pfd[2], ffd, ret;
-       unsigned long long b_sent = 0;
-       int bla = 1;
+       int fd, ret;
 
-       if (argc < 4) {
-               printf("%s: file target port\n", argv[0]);
-               return 1;
-       }
+       if (argc < 3)
+               return usage(argv[0]);
+
+       if (check_input_pipe())
+               return usage(argv[0]);
 
-       port = atoi(argv[3]);
+       port = atoi(argv[2]);
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
 
-       if (inet_aton(argv[2], &addr.sin_addr) != 1) {
-               struct hostent *hent = gethostbyname(argv[2]);
+       if (inet_aton(argv[1], &addr.sin_addr) != 1) {
+               struct hostent *hent = gethostbyname(argv[1]);
 
-               if (!hent) {
-                       perror("gethostbyname");
-                       return 1;
-               }
+               if (!hent)
+                       return error("gethostbyname");
 
                memcpy(&addr.sin_addr, hent->h_addr, 4);
        }
 
-       printf("Connecting to %s/%d\n", argv[2], port);
+       printf("Connecting to %s/%d\n", argv[1], port);
 
        fd = socket(AF_INET, SOCK_STREAM, 0);
-       if (fd < 0) {
-               perror("socket");
-               return 1;
-       }
-
-       if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               perror("connect");
-               return 1;
-       }
-
-       if (pipe(pfd) < 0) {
-               perror("pipe");
-               return 1;
-       }
-
-       ffd = open(argv[1], O_RDWR);
-       if (ffd < 0) {
-               perror("open input");
-               return 1;
-       }
+       if (fd < 0)
+               return error("socket");
 
-       signal(SIGINT, show_rate);
-       gettimeofday(&start_time, NULL);
+       if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+               return error("connect");
 
        do {
-               if (kb_sent >= 128*1024) {
-                       b_sent += 40000;
-                       ret = ftruncate(ffd, b_sent);
-                       printf("trunc file a little %d\n", ret);
-                       bla = 0;
-               }
-                       
-               ret = splice(ffd, NULL, pfd[1], NULL, SPLICE_SIZE, 0x02);
-
-               if (!bla)
-                       printf("spliced %d\n", ret);
-
+               ret = splice(STDIN_FILENO, NULL, fd, NULL, SPLICE_SIZE, SPLICE_F_NONBLOCK);
                if (ret < 0) {
-                       perror("splice");
-                       break;
-               } else if (!ret) {
+                       if (errno == EAGAIN) {
+                               usleep(100);
+                               continue;
+                       }
+                       return error("splice");
+               } else if (!ret)
                        break;
-               }
-               b_sent += ret;
-               kb_sent += ret >> 10;
-               iters++;
-               while (ret > 0) {
-                       int flags = 0;
-                       int written = splice(pfd[0], NULL, fd, NULL, ret, flags);
-                       if (written < 0) {
-                               perror("splice-out");
-                               break;
-                       } else if (!written)
-                               break;
-                       ret -= written;
-               }
-       } while (kb_sent < 512 * 1024 && bla);
+       } while (1);
 
-       show_rate(0);
        close(fd);
        return 0;
 }