X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=8dff813cc20bab39d7b1ac13d1ca0c80d611440a;hp=2dab64ee3212b35e400a430b342b80da835ae5d3;hb=5b42a488b1e3be03ecec9305affbbabaa2f2134e;hpb=02af09886db695e5ea2b7fd2a632733955f3c03f diff --git a/fio.c b/fio.c index 2dab64ee..8dff813c 100644 --- a/fio.c +++ b/fio.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -38,6 +39,7 @@ #include "hash.h" #include "smalloc.h" #include "verify.h" +#include "trim.h" #include "diskutil.h" #include "cgroup.h" #include "profile.h" @@ -61,7 +63,7 @@ static struct fio_mutex *startup_mutex; static struct fio_mutex *writeout_mutex; static volatile int fio_abort; static int exit_value; -static struct itimerval itimer; +static timer_t ival_timer; static pthread_t gtod_thread; static struct flist_head *cgroup_list; static char *cgroup_mnt; @@ -112,17 +114,21 @@ static void terminate_threads(int group_id) static void status_timer_arm(void) { - itimer.it_value.tv_sec = 0; - itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000; - setitimer(ITIMER_REAL, &itimer, NULL); + 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 sig_alrm(int fio_unused sig) +static void ival_fn(union sigval sig) { if (threads) { update_io_ticks(); print_thread_status(); - status_timer_arm(); } } @@ -142,15 +148,27 @@ static void sig_int(int sig) } } +static void posix_timer_teardown(void) +{ + timer_delete(ival_timer); +} + +static void posix_timer_setup(void) +{ + struct sigevent evt; + + memset(&evt, 0, sizeof(evt)); + evt.sigev_notify = SIGEV_THREAD; + evt.sigev_notify_function = ival_fn; + + if (timer_create(CLOCK_MONOTONIC, &evt, &ival_timer) < 0) + perror("timer_create"); +} + 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; @@ -176,6 +194,8 @@ static int __check_min_rate(struct thread_data *td, struct timeval *now, unsigned int rate_iops = 0; unsigned int rate_iops_min = 0; + assert(ddir_rw(ddir)); + if (!td->o.ratemin[ddir] && !td->o.rate_iops_min[ddir]) return 0; @@ -491,7 +511,8 @@ static void do_verify(struct thread_data *td) io_u->xfer_buf += bytes; io_u->offset += bytes; - td->ts.short_io_u[io_u->ddir]++; + if (ddir_rw(io_u->ddir)) + td->ts.short_io_u[io_u->ddir]++; if (io_u->offset == f->real_file_size) goto sync_done; @@ -576,6 +597,7 @@ static void do_io(struct thread_data *td) td_set_runstate(td, TD_RUNNING); while ( (td->o.read_iolog_file && !flist_empty(&td->io_log_list)) || + (!flist_empty(&td->trim_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 }; @@ -636,7 +658,8 @@ static void do_io(struct thread_data *td) io_u->xfer_buf += bytes; io_u->offset += bytes; - td->ts.short_io_u[io_u->ddir]++; + if (ddir_rw(io_u->ddir)) + td->ts.short_io_u[io_u->ddir]++; if (io_u->offset == f->real_file_size) goto sync_done; @@ -730,6 +753,9 @@ sync_done: } } + if (td->trim_entries) + printf("trim entries %ld\n", td->trim_entries); + if (td->o.fill_device && td->error == ENOSPC) { td->error = 0; td->terminate = 1; @@ -802,7 +828,8 @@ static int init_io_u(struct thread_data *td) if (allocate_io_mem(td)) return 1; - if (td->o.odirect || td->o.mem_align) + if (td->o.odirect || td->o.mem_align || + (td->io_ops->flags & FIO_RAWIO)) p = PAGE_ALIGN(td->orig_buffer) + td->o.mem_align; else p = td->orig_buffer; @@ -831,6 +858,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; @@ -955,6 +989,8 @@ void reset_all_stats(struct thread_data *td) } fio_gettime(&tv, NULL); + td->ts.runtime[0] = 0; + td->ts.runtime[1] = 0; memcpy(&td->epoch, &tv, sizeof(tv)); memcpy(&td->start, &tv, sizeof(tv)); } @@ -993,7 +1029,7 @@ static int exec_string(const char *string) */ static void *thread_main(void *data) { - unsigned long long runtime[2], elapsed; + unsigned long long elapsed; struct thread_data *td = data; pthread_condattr_t attr; int clear_state; @@ -1011,6 +1047,7 @@ static void *thread_main(void *data) INIT_FLIST_HEAD(&td->io_log_list); INIT_FLIST_HEAD(&td->io_hist_list); INIT_FLIST_HEAD(&td->verify_list); + INIT_FLIST_HEAD(&td->trim_list); pthread_mutex_init(&td->io_u_lock, NULL); td->io_hist_tree = RB_ROOT; @@ -1110,7 +1147,6 @@ static void *thread_main(void *data) fio_gettime(&td->epoch, NULL); getrusage(RUSAGE_SELF, &td->ts.ru_start); - runtime[0] = runtime[1] = 0; clear_state = 0; while (keep_running(td)) { fio_gettime(&td->start, NULL); @@ -1135,11 +1171,11 @@ static void *thread_main(void *data) if (td_read(td) && td->io_bytes[DDIR_READ]) { elapsed = utime_since_now(&td->start); - runtime[DDIR_READ] += elapsed; + td->ts.runtime[DDIR_READ] += elapsed; } if (td_write(td) && td->io_bytes[DDIR_WRITE]) { elapsed = utime_since_now(&td->start); - runtime[DDIR_WRITE] += elapsed; + td->ts.runtime[DDIR_WRITE] += elapsed; } if (td->error || td->terminate) @@ -1156,15 +1192,15 @@ static void *thread_main(void *data) do_verify(td); - runtime[DDIR_READ] += utime_since_now(&td->start); + td->ts.runtime[DDIR_READ] += utime_since_now(&td->start); if (td->error || td->terminate) break; } update_rusage_stat(td); - td->ts.runtime[0] = (runtime[0] + 999) / 1000; - td->ts.runtime[1] = (runtime[1] + 999) / 1000; + td->ts.runtime[0] = (td->ts.runtime[0] + 999) / 1000; + td->ts.runtime[1] = (td->ts.runtime[1] + 999) / 1000; td->ts.total_run_time = mtime_since_now(&td->epoch); td->ts.io_bytes[0] = td->io_bytes[0]; td->ts.io_bytes[1] = td->io_bytes[1]; @@ -1373,9 +1409,13 @@ static void *gtod_thread_main(void *data) static int fio_start_gtod_thread(void) { + pthread_attr_t attr; int ret; - ret = pthread_create(>od_thread, NULL, gtod_thread_main, NULL); + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); + ret = pthread_create(>od_thread, &attr, gtod_thread_main, NULL); + pthread_attr_destroy(&attr); if (ret) { log_err("Can't create gtod thread: %s\n", strerror(ret)); return 1; @@ -1667,6 +1707,7 @@ int main(int argc, char *argv[]) set_genesis_time(); + posix_timer_setup(); status_timer_arm(); cgroup_list = smalloc(sizeof(*cgroup_list)); @@ -1687,6 +1728,7 @@ 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;