[PATCH] Simple support for networked IO

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 4c761c038bd170f16d0d10c094c69e96f7fa503f..bce13a72306fccc62d84020ee4d57a3a2d8d8722 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -37,9 +37,9 @@
 #include "fio.h"
 #include "os.h"
 
-#define MASK   (4095)
-
-#define ALIGN(buf)     (char *) (((unsigned long) (buf) + MASK) & ~(MASK))
+static unsigned long page_mask;
+#define ALIGN(buf)     \
+       (char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
 
 int groupid = 0;
 int thread_number = 0;
@@ -528,7 +528,7 @@ static int init_io_u(struct thread_data *td)
        if (td->mem_type == MEM_SHMHUGE || td->mem_type == MEM_MMAPHUGE)
                td->orig_buffer_size = (td->orig_buffer_size + td->hugepage_size - 1) & ~(td->hugepage_size - 1);
        else
-               td->orig_buffer_size += MASK;
+               td->orig_buffer_size += page_mask;
 
        if (allocate_io_mem(td))
                return 1;
@@ -647,9 +647,6 @@ static void *thread_main(void *data)
                goto err;
        }
 
-       if (td_io_init(td))
-               goto err;
-
        if (init_iolog(td))
                goto err;
 
@@ -680,6 +677,13 @@ static void *thread_main(void *data)
        if (open_files(td))
                goto err;
 
+       /*
+        * Do this late, as some IO engines would like to have the
+        * files setup prior to initializing structures.
+        */
+       if (td_io_init(td))
+               goto err;
+
        if (td->exec_prerun)
                system(td->exec_prerun);
 
@@ -837,7 +841,6 @@ static void run_threads(void)
 
        signal(SIGINT, sig_handler);
        signal(SIGALRM, sig_handler);
-       signal(SIGSEGV, sig_handler);
 
        todo = thread_number;
        nr_running = 0;
@@ -992,6 +995,8 @@ static void run_threads(void)
 
 int main(int argc, char *argv[])
 {
+       long ps;
+
        if (parse_options(argc, argv))
                return 1;
 
@@ -1000,6 +1005,14 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       ps = sysconf(_SC_PAGESIZE);
+       if (ps < 0) {
+               log_err("Failed to get page size\n");
+               return 1;
+       }
+
+       page_mask = ps - 1;
+
        if (write_bw_log) {
                setup_log(&agg_io_log[DDIR_READ]);
                setup_log(&agg_io_log[DDIR_WRITE]);