Move thread options into a seperate structure

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index c2f45e5f1a870510af6ff09d18f0ccc355e5dbf6..2bbbb0ec78fee436bcdc00fd6b3eeef98fa218e9 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -1,5 +1,8 @@
 /*
- * Transfer data over the net.
+ * net engine
+ *
+ * IO engine that reads/writes to/from sockets.
+ *
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -108,7 +111,7 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
        struct pollfd pfd;
        int ret;
 
-       fprintf(f_out, "fio: waiting for connection\n");
+       log_info("fio: waiting for connection\n");
 
        /*
         * Accept loop. poll for incoming events, accept them. Repeat until we
@@ -227,7 +230,7 @@ static int fio_netio_init(struct thread_data *td)
        char *sep;
        int ret;
 
-       if (!td->total_file_size) {
+       if (!td->o.size) {
                log_err("fio: need size= set\n");
                return 1;
        }
@@ -237,11 +240,11 @@ static int fio_netio_init(struct thread_data *td)
                return 1;
        }
 
-       strcpy(buf, td->filename);
+       strcpy(buf, td->o.filename);
 
-       sep = strchr(buf, ':');
+       sep = strchr(buf, '/');
        if (!sep) {
-               log_err("fio: bad network host:port <<%s>>\n", td->filename);
+               log_err("fio: bad network host/port <<%s>>\n", td->o.filename);
                return 1;
        }
 
@@ -261,11 +264,11 @@ static int fio_netio_init(struct thread_data *td)
        if (ret)
                return ret;
 
-       td->io_size = td->total_file_size;
+       td->io_size = td->o.size;
        td->total_io_size = td->io_size;
 
        for_each_file(td, f, i) {
-               f->file_size = td->total_file_size / td->nr_files;
+               f->file_size = td->o.size / td->o.nr_files;
                f->real_file_size = f->file_size;
        }