static struct fio_mutex *startup_mutex;
static volatile int fio_abort;
static int exit_value;
+static struct itimerval itimer;
struct io_log *agg_io_log[2];
if (td->runstate == runstate)
return;
- dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
- runstate);
+ dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid,
+ td->runstate, runstate);
td->runstate = runstate;
}
for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
dprint(FD_PROCESS, "setting terminate on %s/%d\n",
- td->o.name, td->pid);
+ td->o.name, (int) td->pid);
td->terminate = 1;
td->o.start_delay = 0;
}
}
-static void sig_handler(int sig)
+static void status_timer_arm(void)
{
- if (!threads)
- return;
+ itimer.it_value.tv_sec = 0;
+ itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
+ setitimer(ITIMER_REAL, &itimer, NULL);
+}
- switch (sig) {
- case SIGALRM:
+static void sig_alrm(int sig)
+{
+ if (threads) {
update_io_ticks();
- disk_util_timer_arm();
print_thread_status();
- break;
- default:
+ status_timer_arm();
+ }
+}
+
+static void sig_int(int sig)
+{
+ if (threads) {
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
terminate_threads(TERMINATE_ALL);
- break;
}
}
+/*
+ * We need to rearm on BSD/solaris. Switch this to sigaction in the future...
+ */
+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;
+ sigaction(SIGINT, &act, NULL);
+}
+
/*
* Check if we are above the minimum rate given.
*/
td->pid = getpid();
- dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+ dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
INIT_LIST_HEAD(&td->io_u_freelist);
INIT_LIST_HEAD(&td->io_u_busylist);
err:
if (td->error)
- printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error,
+ printf("fio: pid=%d, err=%d/%s\n", (int) td->pid, td->error,
td->verror);
close_and_free_files(td);
close_ioengine(td);
ret = waitpid(td->pid, &status, flags);
if (ret < 0) {
if (errno == ECHILD) {
- log_err("fio: pid=%d disappeared %d\n", td->pid,
- td->runstate);
+ log_err("fio: pid=%d disappeared %d\n",
+ (int) td->pid, td->runstate);
td_set_runstate(td, TD_REAPED);
goto reaped;
}
if (sig != SIGQUIT)
log_err("fio: pid=%d, got signal=%d\n",
- td->pid, sig);
+ (int) td->pid, sig);
td_set_runstate(td, TD_REAPED);
goto reaped;
}
fflush(stdout);
}
- signal(SIGINT, sig_handler);
- signal(SIGALRM, sig_handler);
+ set_sig_handlers();
todo = thread_number;
nr_running = 0;
if (setup_files(td)) {
exit_value++;
if (td->error)
- log_err("fio: pid=%d, err=%d/%s\n", td->pid,
- td->error, td->verror);
+ log_err("fio: pid=%d, err=%d/%s\n",
+ (int) td->pid, td->error, td->verror);
td_set_runstate(td, TD_REAPED);
todo--;
} else {
set_genesis_time();
- disk_util_timer_arm();
+ status_timer_arm();
run_threads();