Remove comment wrt sigaction() usage, it's deprecated

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index c17ea3c3ae8822ba68f8f705c4ce13812d5052a3..f0566ed77f75f71b33634c3ba2cac7dbe4aa23eb 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -54,6 +54,7 @@ unsigned long done_secs = 0;
 static struct fio_mutex *startup_mutex;
 static volatile int fio_abort;
 static int exit_value;
+static struct itimerval itimer;
 
 struct io_log *agg_io_log[2];
 
@@ -65,8 +66,8 @@ static inline void td_set_runstate(struct thread_data *td, int runstate)
        if (td->runstate == runstate)
                return;
 
-       dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
-                                                               runstate);
+       dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid,
+                                               td->runstate, runstate);
        td->runstate = runstate;
 }
 
@@ -80,7 +81,7 @@ static void terminate_threads(int group_id)
        for_each_td(td, i) {
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
-                                                       td->o.name, td->pid);
+                                               td->o.name, (int) td->pid);
                        td->terminate = 1;
                        td->o.start_delay = 0;
 
@@ -99,22 +100,46 @@ static void terminate_threads(int group_id)
        }
 }
 
-static void sig_handler(int sig)
+static void status_timer_arm(void)
 {
-       switch (sig) {
-       case SIGALRM:
+       itimer.it_value.tv_sec = 0;
+       itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
+       setitimer(ITIMER_REAL, &itimer, NULL);
+}
+
+static void sig_alrm(int sig)
+{
+       if (threads) {
                update_io_ticks();
-               disk_util_timer_arm();
                print_thread_status();
-               break;
-       default:
+               status_timer_arm();
+       }
+}
+
+static void sig_int(int sig)
+{
+       if (threads) {
                printf("\nfio: terminating on signal %d\n", sig);
                fflush(stdout);
                terminate_threads(TERMINATE_ALL);
-               break;
        }
 }
 
+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;
+       sigaction(SIGINT, &act, NULL);
+}
+
 /*
  * Check if we are above the minimum rate given.
  */
@@ -215,7 +240,7 @@ static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
  */
 static void cleanup_pending_aio(struct thread_data *td)
 {
-       struct list_head *entry, *n;
+       struct flist_head *entry, *n;
        struct io_u *io_u;
        int r;
 
@@ -230,8 +255,8 @@ static void cleanup_pending_aio(struct thread_data *td)
         * now cancel remaining active events
         */
        if (td->io_ops->cancel) {
-               list_for_each_safe(entry, n, &td->io_u_busylist) {
-                       io_u = list_entry(entry, struct io_u, list);
+               flist_for_each_safe(entry, n, &td->io_u_busylist) {
+                       io_u = flist_entry(entry, struct io_u, list);
 
                        /*
                         * if the io_u isn't in flight, then that generally
@@ -367,7 +392,7 @@ static void do_verify(struct thread_data *td)
                                 * zero read, fail
                                 */
                                if (!bytes) {
-                                       td_verror(td, ENODATA, "full resid");
+                                       td_verror(td, EIO, "full resid");
                                        put_io_u(td, io_u);
                                        break;
                                }
@@ -495,7 +520,7 @@ static void do_io(struct thread_data *td)
                                 * zero read, fail
                                 */
                                if (!bytes) {
-                                       td_verror(td, ENODATA, "full resid");
+                                       td_verror(td, EIO, "full resid");
                                        put_io_u(td, io_u);
                                        break;
                                }
@@ -572,7 +597,7 @@ sync_done:
                if (check_min_rate(td, &comp_time)) {
                        if (exitall_on_terminate)
                                terminate_threads(td->groupid);
-                       td_verror(td, ENODATA, "check_min_rate");
+                       td_verror(td, EIO, "check_min_rate");
                        break;
                }
 
@@ -625,13 +650,13 @@ sync_done:
 
 static void cleanup_io_u(struct thread_data *td)
 {
-       struct list_head *entry, *n;
+       struct flist_head *entry, *n;
        struct io_u *io_u;
 
-       list_for_each_safe(entry, n, &td->io_u_freelist) {
-               io_u = list_entry(entry, struct io_u, list);
+       flist_for_each_safe(entry, n, &td->io_u_freelist) {
+               io_u = flist_entry(entry, struct io_u, list);
 
-               list_del(&io_u->list);
+               flist_del(&io_u->list);
                free(io_u);
        }
 
@@ -675,7 +700,7 @@ static int init_io_u(struct thread_data *td)
                        return 1;
                io_u = malloc(sizeof(*io_u));
                memset(io_u, 0, sizeof(*io_u));
-               INIT_LIST_HEAD(&io_u->list);
+               INIT_FLIST_HEAD(&io_u->list);
 
                if (!(td->io_ops->flags & FIO_NOIO)) {
                        io_u->buf = p + max_bs * i;
@@ -686,7 +711,7 @@ static int init_io_u(struct thread_data *td)
 
                io_u->index = i;
                io_u->flags = IO_U_F_FREE;
-               list_add(&io_u->list, &td->io_u_freelist);
+               flist_add(&io_u->list, &td->io_u_freelist);
        }
 
        io_u_init_timeout();
@@ -820,13 +845,13 @@ static void *thread_main(void *data)
 
        td->pid = getpid();
 
-       dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+       dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
 
-       INIT_LIST_HEAD(&td->io_u_freelist);
-       INIT_LIST_HEAD(&td->io_u_busylist);
-       INIT_LIST_HEAD(&td->io_u_requeues);
-       INIT_LIST_HEAD(&td->io_log_list);
-       INIT_LIST_HEAD(&td->io_hist_list);
+       INIT_FLIST_HEAD(&td->io_u_freelist);
+       INIT_FLIST_HEAD(&td->io_u_busylist);
+       INIT_FLIST_HEAD(&td->io_u_requeues);
+       INIT_FLIST_HEAD(&td->io_log_list);
+       INIT_FLIST_HEAD(&td->io_hist_list);
        td->io_hist_tree = RB_ROOT;
 
        td_set_runstate(td, TD_INITIALIZED);
@@ -972,7 +997,7 @@ static void *thread_main(void *data)
 
 err:
        if (td->error)
-               printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error,
+               printf("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error,
                                                        td->verror);
        close_and_free_files(td);
        close_ioengine(td);
@@ -1060,8 +1085,8 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
                ret = waitpid(td->pid, &status, flags);
                if (ret < 0) {
                        if (errno == ECHILD) {
-                               log_err("fio: pid=%d disappeared %d\n", td->pid,
-                                                               td->runstate);
+                               log_err("fio: pid=%d disappeared %d\n",
+                                               (int) td->pid, td->runstate);
                                td_set_runstate(td, TD_REAPED);
                                goto reaped;
                        }
@@ -1072,7 +1097,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 
                                if (sig != SIGQUIT)
                                        log_err("fio: pid=%d, got signal=%d\n",
-                                                               td->pid, sig);
+                                                       (int) td->pid, sig);
                                td_set_runstate(td, TD_REAPED);
                                goto reaped;
                        }
@@ -1134,8 +1159,7 @@ static void run_threads(void)
                fflush(stdout);
        }
 
-       signal(SIGINT, sig_handler);
-       signal(SIGALRM, sig_handler);
+       set_sig_handlers();
 
        todo = thread_number;
        nr_running = 0;
@@ -1158,8 +1182,8 @@ static void run_threads(void)
                if (setup_files(td)) {
                        exit_value++;
                        if (td->error)
-                               log_err("fio: pid=%d, err=%d/%s\n", td->pid,
-                                                       td->error, td->verror);
+                               log_err("fio: pid=%d, err=%d/%s\n",
+                                       (int) td->pid, td->error, td->verror);
                        td_set_runstate(td, TD_REAPED);
                        todo--;
                } else {
@@ -1353,7 +1377,7 @@ int main(int argc, char *argv[])
 
        set_genesis_time();
 
-       disk_util_timer_arm();
+       status_timer_arm();
 
        run_threads();