Add simple aligned alloc helper

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 2420d1039cd18cf1b99f4c10c6568f61ce42a678..a737a310df821b62978fc420a36968d7c64c8324 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <limits.h>
 #include <signal.h>
 #include <time.h>
 #include <locale.h>
@@ -44,6 +45,7 @@
 #include "cgroup.h"
 #include "profile.h"
 #include "lib/rand.h"
+#include "memalign.h"
 
 unsigned long page_mask;
 unsigned long page_size;
@@ -63,8 +65,8 @@ static struct fio_mutex *startup_mutex;
 static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
 static int exit_value;
-static timer_t ival_timer;
 static pthread_t gtod_thread;
+static pthread_t disk_util_thread;
 static struct flist_head *cgroup_list;
 static char *cgroup_mnt;
 
@@ -112,26 +114,6 @@ static void terminate_threads(int group_id)
        }
 }
 
-static void status_timer_arm(void)
-{
-       struct itimerspec value;
-
-       value.it_value.tv_sec = 0;
-       value.it_value.tv_nsec = DISK_UTIL_MSEC * 1000000;
-       value.it_interval.tv_sec = 0;
-       value.it_interval.tv_nsec = DISK_UTIL_MSEC * 1000000;
-
-       timer_settime(ival_timer, 0, &value, NULL);
-}
-
-static void ival_fn(union sigval sig)
-{
-       if (threads) {
-               update_io_ticks();
-               print_thread_status();
-       }
-}
-
 /*
  * Happens on thread runs with ctrl-c, ignore our own SIGQUIT
  */
@@ -148,27 +130,41 @@ static void sig_int(int sig)
        }
 }
 
-static void posix_timer_teardown(void)
+static void *disk_thread_main(void *data)
 {
-       timer_delete(ival_timer);
+       fio_mutex_up(startup_mutex);
+
+       while (threads) {
+               usleep(DISK_UTIL_MSEC * 1000);
+               if (!threads)
+                       break;
+               update_io_ticks();
+               print_thread_status();
+       }
+
+       return NULL;
 }
 
-static void posix_timer_setup(void)
+static int create_disk_util_thread(void)
 {
-       struct sigevent evt;
+       int ret;
 
-       memset(&evt, 0, sizeof(evt));
-       evt.sigev_notify = SIGEV_THREAD;
-       evt.sigev_notify_function = ival_fn;
+       ret = pthread_create(&disk_util_thread, NULL, disk_thread_main, NULL);
+       if (ret) {
+               log_err("Can't create disk util thread: %s\n", strerror(ret));
+               return 1;
+       }
 
-#ifndef __CYGWIN__
-       if (timer_create(CLOCK_MONOTONIC, &evt, &ival_timer) < 0)
-               perror("timer_create");
-#else /* Windows (and thus Cygwin) doesn't have a monotonic clock */
-       if (timer_create(CLOCK_REALTIME, &evt, &ival_timer) < 0)
-               perror("timer_create");
-#endif
+       ret = pthread_detach(disk_util_thread);
+       if (ret) {
+               log_err("Can't detatch disk util thread: %s\n", strerror(ret));
+               return 1;
+       }
 
+       dprint(FD_MUTEX, "wait on startup_mutex\n");
+       fio_mutex_down(startup_mutex);
+       dprint(FD_MUTEX, "done waiting on startup_mutex\n");
+       return 0;
 }
 
 static void set_sig_handlers(void)
@@ -502,7 +498,6 @@ static void do_verify(struct thread_data *td)
                                clear_io_u(td, io_u);
                        } else if (io_u->resid) {
                                int bytes = io_u->xfer_buflen - io_u->resid;
-                               struct fio_file *f = io_u->file;
 
                                /*
                                 * zero read, fail
@@ -520,6 +515,7 @@ static void do_verify(struct thread_data *td)
                                if (ddir_rw(io_u->ddir))
                                        td->ts.short_io_u[io_u->ddir]++;
 
+                               f = io_u->file;
                                if (io_u->offset == f->real_file_size)
                                        goto sync_done;
 
@@ -801,7 +797,7 @@ static void cleanup_io_u(struct thread_data *td)
                io_u = flist_entry(entry, struct io_u, list);
 
                flist_del(&io_u->list);
-               free(io_u);
+               fio_memfree(io_u, sizeof(*io_u));
        }
 
        free_io_mem(td);
@@ -848,8 +844,9 @@ static int init_io_u(struct thread_data *td)
                if (td->terminate)
                        return 1;
 
-               if (posix_memalign(&ptr, cl_align, sizeof(*io_u))) {
-                       log_err("fio: posix_memalign=%s\n", strerror(errno));
+               ptr = fio_memalign(cl_align, sizeof(*io_u));
+               if (!ptr) {
+                       log_err("fio: unable to allocate aligned memory\n");
                        break;
                }
 
@@ -869,7 +866,7 @@ static int init_io_u(struct thread_data *td)
                                 * Fill the buffer with the pattern if we are
                                 * going to be doing writes.
                                 */
-                               fill_pattern(td, io_u->buf, max_bs, io_u);
+                               fill_pattern(td, io_u->buf, max_bs, io_u, 0, 0);
                        }
                }
 
@@ -993,7 +990,7 @@ void reset_all_stats(struct thread_data *td)
                td->io_issues[i] = 0;
                td->ts.total_io_u[i] = 0;
        }
-       
+
        fio_gettime(&tv, NULL);
        td->ts.runtime[0] = 0;
        td->ts.runtime[1] = 0;
@@ -1074,14 +1071,18 @@ static void *thread_main(void *data)
         */
        fio_mutex_remove(td->mutex);
 
-       if (td->o.uid != -1U && setuid(td->o.uid)) {
-               td_verror(td, errno, "setuid");
-               goto err;
-       }
+       /*
+        * A new gid requires privilege, so we need to do this before setting
+        * the uid.
+        */
        if (td->o.gid != -1U && setgid(td->o.gid)) {
                td_verror(td, errno, "setgid");
                goto err;
        }
+       if (td->o.uid != -1U && setuid(td->o.uid)) {
+               td_verror(td, errno, "setuid");
+               goto err;
+       }
 
        /*
         * May alter parameters that init_io_u() will use, so we need to
@@ -1498,14 +1499,14 @@ static void run_threads(void)
                        todo--;
                } else {
                        struct fio_file *f;
-                       unsigned int i;
+                       unsigned int j;
 
                        /*
                         * for sharing to work, each job must always open
                         * its own files. so close them, if we opened them
                         * for creation
                         */
-                       for_each_file(td, f, i) {
+                       for_each_file(td, f, j) {
                                if (fio_file_open(f))
                                        td_io_close_file(td, f);
                        }
@@ -1716,9 +1717,7 @@ int main(int argc, char *argv[])
                return 1;
 
        set_genesis_time();
-
-       posix_timer_setup();
-       status_timer_arm();
+       create_disk_util_thread();
 
        cgroup_list = smalloc(sizeof(*cgroup_list));
        INIT_FLIST_HEAD(cgroup_list);
@@ -1738,7 +1737,6 @@ int main(int argc, char *argv[])
        sfree(cgroup_list);
        sfree(cgroup_mnt);
 
-       posix_timer_teardown();
        fio_mutex_remove(startup_mutex);
        fio_mutex_remove(writeout_mutex);
        return exit_value;