Call path below SIGALRM isn't safe

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index c8de2ee7a7e3a3f94a0f1af8dc01080c01e22be1..91bf6b613cac30403ff9c7ec96865a2b56051103 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <locale.h>
 #include <assert.h>
+#include <time.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
@@ -38,6 +39,7 @@
 #include "hash.h"
 #include "smalloc.h"
 #include "verify.h"
+#include "trim.h"
 #include "diskutil.h"
 #include "cgroup.h"
 #include "profile.h"
@@ -61,7 +63,7 @@ static struct fio_mutex *startup_mutex;
 static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
 static int exit_value;
-static struct itimerval itimer;
+static timer_t ival_timer;
 static pthread_t gtod_thread;
 static struct flist_head *cgroup_list;
 static char *cgroup_mnt;
@@ -112,17 +114,21 @@ static void terminate_threads(int group_id)
 
 static void status_timer_arm(void)
 {
-       itimer.it_value.tv_sec = 0;
-       itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
-       setitimer(ITIMER_REAL, &itimer, NULL);
+       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 sig_alrm(int fio_unused sig)
+static void ival_fn(union sigval sig)
 {
        if (threads) {
                update_io_ticks();
                print_thread_status();
-               status_timer_arm();
        }
 }
 
@@ -142,15 +148,27 @@ static void sig_int(int sig)
        }
 }
 
+static void posix_timer_teardown(void)
+{
+       timer_delete(ival_timer);
+}
+
+static void posix_timer_setup(void)
+{
+       struct sigevent evt;
+
+       memset(&evt, 0, sizeof(evt));
+       evt.sigev_notify = SIGEV_THREAD;
+       evt.sigev_notify_function = ival_fn;
+
+       if (timer_create(CLOCK_MONOTONIC, &evt, &ival_timer) < 0)
+               perror("timer_create");
+}
+
 static void set_sig_handlers(void)
 {
        struct sigaction act;
 
-       memset(&act, 0, sizeof(act));
-       act.sa_handler = sig_alrm;
-       act.sa_flags = SA_RESTART;
-       sigaction(SIGALRM, &act, NULL);
-
        memset(&act, 0, sizeof(act));
        act.sa_handler = sig_int;
        act.sa_flags = SA_RESTART;
@@ -579,6 +597,7 @@ static void do_io(struct thread_data *td)
                td_set_runstate(td, TD_RUNNING);
 
        while ( (td->o.read_iolog_file && !flist_empty(&td->io_log_list)) ||
+               (!flist_empty(&td->trim_list)) ||
                ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->o.size) ) {
                struct timeval comp_time;
                unsigned long bytes_done[2] = { 0, 0 };
@@ -734,6 +753,9 @@ sync_done:
                }
        }
 
+       if (td->trim_entries)
+               printf("trim entries %ld\n", td->trim_entries);
+
        if (td->o.fill_device && td->error == ENOSPC) {
                td->error = 0;
                td->terminate = 1;
@@ -806,7 +828,8 @@ static int init_io_u(struct thread_data *td)
        if (allocate_io_mem(td))
                return 1;
 
-       if (td->o.odirect || td->o.mem_align)
+       if (td->o.odirect || td->o.mem_align ||
+           (td->io_ops->flags & FIO_RAWIO))
                p = PAGE_ALIGN(td->orig_buffer) + td->o.mem_align;
        else
                p = td->orig_buffer;
@@ -1683,6 +1706,7 @@ int main(int argc, char *argv[])
 
        set_genesis_time();
 
+       posix_timer_setup();
        status_timer_arm();
 
        cgroup_list = smalloc(sizeof(*cgroup_list));
@@ -1703,6 +1727,7 @@ 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;