X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=2beda816bb43d3102c675c848d67794b6f0876ca;hp=a85f577624ab7912b9893ba83dc383ef0fd53022;hb=4b0c257cd785cf7af4a4722f41bd45174283f69d;hpb=9b8365618309572d8fd2579c8ea3132db89f843f diff --git a/fio.c b/fio.c index a85f5776..2beda816 100644 --- a/fio.c +++ b/fio.c @@ -45,6 +45,7 @@ #include "cgroup.h" #include "profile.h" #include "lib/rand.h" +#include "memalign.h" unsigned long page_mask; unsigned long page_size; @@ -64,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; @@ -101,7 +102,7 @@ static void terminate_threads(int group_id) /* * if the thread is running, just let it exit */ - if (td->runstate < TD_RUNNING) + if (td->runstate < TD_RAMP) kill(td->pid, SIGTERM); else { struct ioengine_ops *ops = td->io_ops; @@ -113,58 +114,51 @@ 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 - */ -static void sig_quit(int sig) -{ -} - static void sig_int(int sig) { if (threads) { log_info("\nfio: terminating on signal %d\n", sig); fflush(stdout); + exit_value = 128; terminate_threads(TERMINATE_ALL); } } -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; + } - if (timer_create(FIO_TIMER_CLOCK, &evt, &ival_timer) < 0) - perror("timer_create"); + 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) @@ -177,7 +171,7 @@ static void set_sig_handlers(void) sigaction(SIGINT, &act, NULL); memset(&act, 0, sizeof(act)); - act.sa_handler = sig_quit; + act.sa_handler = sig_int; act.sa_flags = SA_RESTART; sigaction(SIGTERM, &act, NULL); } @@ -186,7 +180,7 @@ static void set_sig_handlers(void) * Check if we are above the minimum rate given. */ static int __check_min_rate(struct thread_data *td, struct timeval *now, - enum td_ddir ddir) + enum fio_ddir ddir) { unsigned long long bytes = 0; unsigned long iops = 0; @@ -498,7 +492,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 @@ -516,6 +509,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; @@ -766,8 +760,11 @@ sync_done: struct fio_file *f; i = td->cur_depth; - if (i) + if (i) { ret = io_u_queued_complete(td, i, NULL); + if (td->o.fill_device && td->error == ENOSPC) + td->error = 0; + } if (should_fsync(td) && td->o.end_fsync) { td_set_runstate(td, TD_FSYNCING); @@ -797,7 +794,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); @@ -844,8 +841,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; } @@ -865,7 +863,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); } } @@ -1070,14 +1068,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 @@ -1494,14 +1496,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); } @@ -1513,7 +1515,7 @@ static void run_threads(void) set_genesis_time(); while (todo) { - struct thread_data *map[MAX_JOBS]; + struct thread_data *map[REAL_MAX_JOBS]; struct timeval this_start; int this_jobs = 0, left; @@ -1712,9 +1714,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); @@ -1734,7 +1734,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;