X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=e205b3aa52ac9f9a693fd249c52de1b84f45afb8;hp=8dff813cc20bab39d7b1ac13d1ca0c80d611440a;hb=3f77f72359e90175d86d549e82c9b2a3488df6dc;hpb=cda99fa0fcca41fc0d54ecaa2fd600162a8de5d3 diff --git a/fio.c b/fio.c index 8dff813c..e205b3aa 100644 --- a/fio.c +++ b/fio.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -63,8 +64,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; @@ -101,37 +102,17 @@ static void terminate_threads(int group_id) * if the thread is running, just let it exit */ if (td->runstate < TD_RUNNING) - kill(td->pid, SIGQUIT); + kill(td->pid, SIGTERM); else { struct ioengine_ops *ops = td->io_ops; - if (ops && (ops->flags & FIO_SIGQUIT)) - kill(td->pid, SIGQUIT); + if (ops && (ops->flags & FIO_SIGTERM)) + kill(td->pid, SIGTERM); } } } } -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,21 +129,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; + + 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; + } - memset(&evt, 0, sizeof(evt)); - evt.sigev_notify = SIGEV_THREAD; - evt.sigev_notify_function = ival_fn; + ret = pthread_detach(disk_util_thread); + if (ret) { + log_err("Can't detatch disk util thread: %s\n", strerror(ret)); + return 1; + } - if (timer_create(CLOCK_MONOTONIC, &evt, &ival_timer) < 0) - perror("timer_create"); + 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) @@ -177,7 +178,7 @@ static void set_sig_handlers(void) memset(&act, 0, sizeof(act)); act.sa_handler = sig_quit; act.sa_flags = SA_RESTART; - sigaction(SIGQUIT, &act, NULL); + sigaction(SIGTERM, &act, NULL); } /* @@ -496,7 +497,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 @@ -514,6 +514,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; @@ -863,7 +864,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); } } @@ -987,7 +988,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; @@ -1068,14 +1069,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 @@ -1352,7 +1357,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate) if (WIFSIGNALED(status)) { int sig = WTERMSIG(status); - if (sig != SIGQUIT) + if (sig != SIGTERM) log_err("fio: pid=%d, got signal=%d\n", (int) td->pid, sig); td_set_runstate(td, TD_REAPED); @@ -1492,14 +1497,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); } @@ -1703,12 +1708,14 @@ int main(int argc, char *argv[]) } startup_mutex = fio_mutex_init(0); + if (startup_mutex == NULL) + return 1; writeout_mutex = fio_mutex_init(1); + if (writeout_mutex == NULL) + 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); @@ -1728,7 +1735,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;