X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=896f79774980758df43755d023cdcac5106fd128;hp=dfd15e0f5db1e943a9aec595454cf1f601e97fea;hb=cbe8d7561cf6d81d741d87eb7940db2a111d2144;hpb=74929ac27bcbaa26a08a9abcda70b5ebba94166e diff --git a/fio.c b/fio.c index dfd15e0f..896f7977 100644 --- a/fio.c +++ b/fio.c @@ -39,6 +39,9 @@ #include "smalloc.h" #include "verify.h" #include "diskutil.h" +#include "cgroup.h" +#include "profile.h" +#include "lib/rand.h" unsigned long page_mask; unsigned long page_size; @@ -60,6 +63,8 @@ static volatile int fio_abort; static int exit_value; static struct itimerval itimer; static pthread_t gtod_thread; +static struct flist_head *cgroup_list; +static char *cgroup_mnt; struct io_log *agg_io_log[2]; @@ -131,23 +136,12 @@ static void sig_quit(int sig) static void sig_int(int sig) { if (threads) { - printf("\nfio: terminating on signal %d\n", sig); + log_info("\nfio: terminating on signal %d\n", sig); fflush(stdout); terminate_threads(TERMINATE_ALL); } } -static void sig_ill(int fio_unused sig) -{ - if (!threads) - return; - - log_err("fio: illegal instruction. your cpu does not support " - "the sse4.2 instruction for crc32c\n"); - terminate_threads(TERMINATE_ALL); - exit(4); -} - static void set_sig_handlers(void) { struct sigaction act; @@ -162,11 +156,6 @@ static void set_sig_handlers(void) act.sa_flags = SA_RESTART; sigaction(SIGINT, &act, NULL); - memset(&act, 0, sizeof(act)); - act.sa_handler = sig_ill; - act.sa_flags = SA_RESTART; - sigaction(SIGILL, &act, NULL); - memset(&act, 0, sizeof(act)); act.sa_handler = sig_quit; act.sa_flags = SA_RESTART; @@ -429,6 +418,8 @@ static void do_verify(struct thread_data *td) int ret, min_events; unsigned int i; + dprint(FD_VERIFY, "starting loop\n"); + /* * sync io first and invalidate cache, to make sure we really * read from disk. @@ -536,7 +527,8 @@ sync_done: */ full = queue_full(td) || ret == FIO_Q_BUSY; if (full || !td->o.iodepth_batch_complete) { - min_events = td->o.iodepth_batch_complete; + min_events = min(td->o.iodepth_batch_complete, + td->cur_depth); if (full && !min_events) min_events = 1; @@ -565,6 +557,8 @@ sync_done: cleanup_pending_aio(td); td_set_runstate(td, TD_RUNNING); + + dprint(FD_VERIFY, "exiting loop\n"); } /* @@ -581,7 +575,8 @@ static void do_io(struct thread_data *td) else td_set_runstate(td, TD_RUNNING); - while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->o.size) { + while ( (td->o.read_iolog_file && !flist_empty(&td->io_log_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 }; int min_evts = 0; @@ -606,7 +601,8 @@ static void do_io(struct thread_data *td) * Add verification end_io handler, if asked to verify * a previously written file. */ - if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_READ) { + if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_READ && + !td_rw(td)) { if (td->o.verify_async) io_u->end_io = verify_io_u_async; else @@ -686,7 +682,8 @@ sync_done: */ full = queue_full(td) || ret == FIO_Q_BUSY; if (full || !td->o.iodepth_batch_complete) { - min_evts = td->o.iodepth_batch_complete; + min_evts = min(td->o.iodepth_batch_complete, + td->cur_depth); if (full && !min_evts) min_evts = 1; @@ -834,6 +831,13 @@ static int init_io_u(struct thread_data *td) if (td_write(td) && !td->o.refill_buffers) io_u_fill_buffer(td, io_u, max_bs); + else if (td_write(td) && td->o.verify_pattern_bytes) { + /* + * Fill the buffer with the pattern if we are + * going to be doing writes. + */ + fill_pattern(td, io_u->buf, max_bs, io_u); + } } io_u->index = i; @@ -1034,6 +1038,15 @@ 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; + } + if (td->o.gid != -1U && setgid(td->o.gid)) { + td_verror(td, errno, "setgid"); + goto err; + } + /* * May alter parameters that init_io_u() will use, so we need to * do this first. @@ -1071,6 +1084,9 @@ static void *thread_main(void *data) } } + if (td->o.cgroup_weight && cgroup_setup(td, cgroup_list, &cgroup_mnt)) + goto err; + if (nice(td->o.nice) == -1) { td_verror(td, errno, "nice"); goto err; @@ -1168,6 +1184,13 @@ static void *thread_main(void *data) } else finish_log(td, td->ts.bw_log, "bw"); } + if (td->ts.lat_log) { + if (td->o.lat_log_file) { + finish_log_named(td, td->ts.lat_log, + td->o.lat_log_file, "lat"); + } else + finish_log(td, td->ts.lat_log, "lat"); + } if (td->ts.slat_log) { if (td->o.lat_log_file) { finish_log_named(td, td->ts.slat_log, @@ -1191,11 +1214,16 @@ static void *thread_main(void *data) err: if (td->error) - printf("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error, + log_info("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error, td->verror); + + if (td->o.verify_async) + verify_async_exit(td); + close_and_free_files(td); close_ioengine(td); cleanup_io_u(td); + cgroup_shutdown(td, &cgroup_mnt); if (td->o.cpumask_set) { int ret = fio_cpuset_exit(&td->o.cpumask); @@ -1203,9 +1231,6 @@ err: td_verror(td, ret, "fio_cpuset_exit"); } - if (td->o.verify_async) - verify_async_exit(td); - /* * do this very late, it will log file closing as well */ @@ -1391,17 +1416,17 @@ static void run_threads(void) return; if (!terse_output) { - printf("Starting "); + log_info("Starting "); if (nr_thread) - printf("%d thread%s", nr_thread, + log_info("%d thread%s", nr_thread, nr_thread > 1 ? "s" : ""); if (nr_process) { if (nr_thread) printf(" and "); - printf("%d process%s", nr_process, + log_info("%d process%s", nr_process, nr_process > 1 ? "es" : ""); } - printf("\n"); + log_info("\n"); fflush(stdout); } @@ -1610,6 +1635,7 @@ int main(int argc, char *argv[]) long ps; sinit(); + init_rand(&__fio_rand_state); /* * We need locale for number printing, if it isn't set then just @@ -1632,6 +1658,9 @@ int main(int argc, char *argv[]) if (parse_options(argc, argv)) return 1; + if (exec_profile && load_profile(exec_profile)) + return 1; + if (!thread_number) return 0; @@ -1647,6 +1676,9 @@ int main(int argc, char *argv[]) status_timer_arm(); + cgroup_list = smalloc(sizeof(*cgroup_list)); + INIT_FLIST_HEAD(cgroup_list); + run_threads(); if (!fio_abort) { @@ -1658,6 +1690,10 @@ int main(int argc, char *argv[]) } } + cgroup_kill(cgroup_list); + sfree(cgroup_list); + sfree(cgroup_mnt); + fio_mutex_remove(startup_mutex); fio_mutex_remove(writeout_mutex); return exit_value;