X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=2a468b134de5bb02ed3ee4dece8b8ea9b645b2b8;hp=dbb9ef65502c0e136785d22902099719e8304173;hb=4e78e405a12b31291aa88fffc1da2cf43b782ef5;hpb=b29ee5b3dee417016164198fb240344ef666de2b diff --git a/fio.c b/fio.c index dbb9ef65..2a468b13 100644 --- a/fio.c +++ b/fio.c @@ -55,6 +55,7 @@ static struct fio_mutex *startup_mutex; static volatile int fio_abort; static int exit_value; static struct itimerval itimer; +static pthread_t gtod_thread; struct io_log *agg_io_log[2]; @@ -107,7 +108,7 @@ static void status_timer_arm(void) setitimer(ITIMER_REAL, &itimer, NULL); } -static void sig_alrm(int sig) +static void sig_alrm(int fio_unused sig) { if (threads) { update_io_ticks(); @@ -116,6 +117,13 @@ static void sig_alrm(int sig) } } +/* + * 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) { @@ -125,7 +133,7 @@ static void sig_int(int sig) } } -static void sig_ill(int sig) +static void sig_ill(int fio_unused sig) { if (!threads) return; @@ -154,6 +162,22 @@ static void set_sig_handlers(void) 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; + sigaction(SIGQUIT, &act, NULL); +} + +static inline int should_check_rate(struct thread_data *td) +{ + /* + * No minimum rate set, always ok + */ + if (!td->o.ratemin && !td->o.rate_iops_min) + return 0; + + return 1; } /* @@ -166,12 +190,6 @@ static int check_min_rate(struct thread_data *td, struct timeval *now) unsigned long spent; unsigned long rate; - /* - * No minimum rate set, always ok - */ - if (!td->o.ratemin && !td->o.rate_iops_min) - return 0; - /* * allow a 2 second settle period in the beginning */ @@ -340,6 +358,12 @@ requeue: return 0; } +static inline void update_tv_cache(struct thread_data *td) +{ + if ((++td->tv_cache_nr & td->tv_cache_mask) == td->tv_cache_mask) + fio_gettime(&td->tv_cache, NULL); +} + /* * The main verify engine. Runs over the writes we previously submitted, * reads the blocks back in, and checks the crc/md5 of the data. @@ -377,7 +401,9 @@ static void do_verify(struct thread_data *td) if (!io_u) break; - if (runtime_exceeded(td, &io_u->start_time)) { + update_tv_cache(td); + + if (runtime_exceeded(td, &td->tv_cache)) { put_io_u(td, io_u); td->terminate = 1; break; @@ -490,7 +516,6 @@ sync_done: */ static void do_io(struct thread_data *td) { - struct timeval s; unsigned long usec; unsigned int i; int ret = 0; @@ -514,9 +539,9 @@ static void do_io(struct thread_data *td) if (!io_u) break; - memcpy(&s, &io_u->start_time, sizeof(s)); + update_tv_cache(td); - if (runtime_exceeded(td, &s)) { + if (runtime_exceeded(td, &td->tv_cache)) { put_io_u(td, io_u); td->terminate = 1; break; @@ -564,7 +589,9 @@ static void do_io(struct thread_data *td) requeue_io_u(td, &io_u); } else { sync_done: - fio_gettime(&comp_time, NULL); + if (should_check_rate(td)) + fio_gettime(&comp_time, NULL); + bytes_done = io_u_sync_complete(td, io_u); if (bytes_done < 0) ret = bytes_done; @@ -603,7 +630,8 @@ sync_done: if (full && !min_evts) min_evts = 1; - fio_gettime(&comp_time, NULL); + if (should_check_rate(td)) + fio_gettime(&comp_time, NULL); do { ret = io_u_queued_complete(td, min_evts); @@ -624,8 +652,8 @@ sync_done: * of completions except the very first one which may look * a little bursty */ - if (!in_ramp_time(td)) { - usec = utime_since(&s, &comp_time); + if (!in_ramp_time(td) && should_check_rate(td)) { + usec = utime_since(&td->tv_cache, &comp_time); rate_throttle(td, usec, bytes_done); @@ -645,7 +673,7 @@ sync_done: int left; if (td->o.thinktime_spin) - __usec_sleep(td->o.thinktime_spin); + usec_spin(td->o.thinktime_spin); left = td->o.thinktime - td->o.thinktime_spin; if (left) @@ -750,8 +778,6 @@ static int init_io_u(struct thread_data *td) flist_add(&io_u->list, &td->io_u_freelist); } - io_u_init_timeout(); - return 0; } @@ -939,6 +965,18 @@ static void *thread_main(void *data) goto err; } + /* + * If we have a gettimeofday() thread, make sure we exclude that + * thread from this job + */ + if (td->o.gtod_cpu) { + fio_cpu_clear(&td->o.cpumask, td->o.gtod_cpu); + if (fio_setaffinity(td) == -1) { + td_verror(td, errno, "cpu_set_affinity"); + goto err; + } + } + if (td->ioprio_set) { if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) { td_verror(td, errno, "ioprio_set"); @@ -972,7 +1010,6 @@ static void *thread_main(void *data) } fio_gettime(&td->epoch, NULL); - memcpy(&td->timeout_end, &td->epoch, sizeof(td->epoch)); getrusage(RUSAGE_SELF, &td->ts.ru_start); runtime[0] = runtime[1] = 0; @@ -980,6 +1017,7 @@ static void *thread_main(void *data) while (keep_running(td)) { fio_gettime(&td->start, NULL); memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start)); + memcpy(&td->tv_cache, &td->start, sizeof(td->start)); if (td->o.ratemin) memcpy(&td->lastrate, &td->ts.stat_sample_time, @@ -1041,12 +1079,27 @@ static void *thread_main(void *data) td->ts.io_bytes[0] = td->io_bytes[0]; td->ts.io_bytes[1] = td->io_bytes[1]; - if (td->ts.bw_log) - finish_log(td, td->ts.bw_log, "bw"); - if (td->ts.slat_log) - finish_log(td, td->ts.slat_log, "slat"); - if (td->ts.clat_log) - finish_log(td, td->ts.clat_log, "clat"); + if (td->ts.bw_log) { + if (td->o.bw_log_file) { + finish_log_named(td, td->ts.bw_log, + td->o.bw_log_file, "bw"); + } else + finish_log(td, td->ts.bw_log, "bw"); + } + if (td->ts.slat_log) { + if (td->o.lat_log_file) { + finish_log_named(td, td->ts.slat_log, + td->o.lat_log_file, "clat"); + } else + finish_log(td, td->ts.slat_log, "slat"); + } + if (td->ts.clat_log) { + if (td->o.lat_log_file) { + finish_log_named(td, td->ts.clat_log, + td->o.lat_log_file, "clat"); + } else + finish_log(td, td->ts.clat_log, "clat"); + } if (td->o.exec_postrun) { if (system(td->o.exec_postrun) < 0) log_err("fio: postrun %s failed\n", td->o.exec_postrun); @@ -1063,6 +1116,9 @@ err: close_ioengine(td); cleanup_io_u(td); + if (td->o.cpumask_set) + fio_cpuset_exit(td); + /* * do this very late, it will log file closing as well */ @@ -1192,6 +1248,39 @@ reaped: terminate_threads(TERMINATE_ALL); } +static void *gtod_thread_main(void *data) +{ + fio_mutex_up(startup_mutex); + + /* + * As long as we have jobs around, update the clock. It would be nice + * to have some way of NOT hammering that CPU with gettimeofday(), + * but I'm not sure what to use outside of a simple CPU nop to relax + * it - we don't want to lose precision. + */ + while (threads) { + fio_gtod_update(); + nop; + } + + return NULL; +} + +static int fio_start_gtod_thread(void) +{ + if (pthread_create(>od_thread, NULL, gtod_thread_main, NULL)) { + perror("Can't create gtod thread"); + return 1; + } + if (pthread_detach(gtod_thread) < 0) { + perror("Can't detatch gtod thread"); + return 1; + } + + fio_mutex_down(startup_mutex); + return 0; +} + /* * Main function for kicking off and reaping jobs, as needed. */ @@ -1204,6 +1293,9 @@ static void run_threads(void) if (fio_pin_memory()) return; + if (fio_gtod_offload && fio_start_gtod_thread()) + return; + if (!terse_output) { printf("Starting "); if (nr_thread)