errno is not negative

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 60d53bc27a5bda48a9996185b03dc844e9cc631e..94bae95af988e167143c089d015a1eda58b81d05 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -41,6 +41,7 @@ static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
+#ifdef FIO_HAVE_SPLICE
 static int splice_io_u(int fdin, int fdout, unsigned int len)
 {
        int bytes = 0;
@@ -161,6 +162,19 @@ static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
 
        return ret;
 }
+#else
+static int fio_netio_splice_in(struct thread_data *td, struct io_u *io_u)
+{
+       errno = EOPNOTSUPP;
+       return -1;
+}
+
+static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
+{
+       errno = EOPNOTSUPP;
+       return -1;
+}
+#endif
 
 static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
 {
@@ -169,8 +183,10 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
        /*
         * if we are going to write more, set MSG_MORE
         */
+#ifdef MSG_MORE
        if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen < td->o.size)
                flags = MSG_MORE;
+#endif
 
        return send(io_u->file->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
 }
@@ -253,7 +269,6 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
                pfd.events = POLLIN;
 
                ret = poll(&pfd, 1, -1);
-               printf("got ret %d\n", ret);
                if (ret < 0) {
                        if (errno == EINTR)
                                continue;
@@ -354,7 +369,7 @@ static int fio_netio_setup_listen(struct thread_data *td, short port)
 static int fio_netio_init(struct thread_data *td)
 {
        struct netio_data *nd = td->io_ops->data;
-       unsigned short port;
+       unsigned int port;
        char host[64], buf[128];
        char *sep;
        int ret;
@@ -371,15 +386,18 @@ static int fio_netio_init(struct thread_data *td)
        strcpy(buf, td->o.filename);
 
        sep = strchr(buf, '/');
-       if (!sep) {
-               log_err("fio: bad network host/port <<%s>>\n", td->o.filename);
-               return 1;
-       }
+       if (!sep)
+               goto bad_host;
 
        *sep = '\0';
        sep++;
        strcpy(host, buf);
-       port = atoi(sep);
+       if (!strlen(host))
+               goto bad_host;
+
+       port = strtol(sep, NULL, 10);
+       if (!port || port > 65535)
+               goto bad_host;
 
        if (td_read(td)) {
                nd->send_to_net = 0;
@@ -390,6 +408,9 @@ static int fio_netio_init(struct thread_data *td)
        }
 
        return ret;
+bad_host:
+       log_err("fio: bad network host/port: %s\n", td->o.filename);
+       return 1;
 }
 
 static void fio_netio_cleanup(struct thread_data *td)
@@ -405,7 +426,6 @@ static void fio_netio_cleanup(struct thread_data *td)
                        close(nd->pipes[1]);
 
                free(nd);
-               td->io_ops->data = NULL;
        }
 }
 
@@ -425,6 +445,7 @@ static int fio_netio_setup(struct thread_data *td)
        return 0;
 }
 
+#ifdef FIO_HAVE_SPLICE
 static int fio_netio_setup_splice(struct thread_data *td)
 {
        struct netio_data *nd;
@@ -443,12 +464,12 @@ static int fio_netio_setup_splice(struct thread_data *td)
        return 1;
 }
 
-static struct ioengine_ops ioengine_rw = {
-       .name           = "net",
+static struct ioengine_ops ioengine_splice = {
+       .name           = "netsplice",
        .version        = FIO_IOOPS_VERSION,
        .prep           = fio_netio_prep,
        .queue          = fio_netio_queue,
-       .setup          = fio_netio_setup,
+       .setup          = fio_netio_setup_splice,
        .init           = fio_netio_init,
        .cleanup        = fio_netio_cleanup,
        .open_file      = fio_netio_open_file,
@@ -456,13 +477,14 @@ static struct ioengine_ops ioengine_rw = {
        .flags          = FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
                          FIO_SIGQUIT,
 };
+#endif
 
-static struct ioengine_ops ioengine_splice = {
-       .name           = "netsplice",
+static struct ioengine_ops ioengine_rw = {
+       .name           = "net",
        .version        = FIO_IOOPS_VERSION,
        .prep           = fio_netio_prep,
        .queue          = fio_netio_queue,
-       .setup          = fio_netio_setup_splice,
+       .setup          = fio_netio_setup,
        .init           = fio_netio_init,
        .cleanup        = fio_netio_cleanup,
        .open_file      = fio_netio_open_file,
@@ -474,11 +496,15 @@ static struct ioengine_ops ioengine_splice = {
 static void fio_init fio_netio_register(void)
 {
        register_ioengine(&ioengine_rw);
+#ifdef FIO_HAVE_SPLICE
        register_ioengine(&ioengine_splice);
+#endif
 }
 
 static void fio_exit fio_netio_unregister(void)
 {
        unregister_ioengine(&ioengine_rw);
+#ifdef FIO_HAVE_SPLICE
        unregister_ioengine(&ioengine_splice);
+#endif
 }