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];
setitimer(ITIMER_REAL, &itimer, NULL);
}
-static void sig_alrm(int sig)
+static void sig_alrm(int fio_unused sig)
{
if (threads) {
update_io_ticks();
}
}
+/*
+ * 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) {
}
}
-static void sig_ill(int sig)
+static void sig_ill(int fio_unused sig)
{
if (!threads)
return;
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;
}
/*
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
*/
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.
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;
*/
static void do_io(struct thread_data *td)
{
- struct timeval s;
unsigned long usec;
unsigned int i;
int ret = 0;
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;
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;
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);
* 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);
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)
flist_add(&io_u->list, &td->io_u_freelist);
}
- io_u_init_timeout();
-
return 0;
}
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");
}
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;
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,
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);
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
*/
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.
*/
if (fio_pin_memory())
return;
+ if (fio_gtod_offload && fio_start_gtod_thread())
+ return;
+
if (!terse_output) {
printf("Starting ");
if (nr_thread)
projects / fio.git / blobdiff