setitimer(ITIMER_REAL, &itimer, NULL);
}
-/*
- * We need to rearm on BSD/solaris. Switch this to sigaction in the future...
- */
-static void set_sig_handlers(void (*sighandler)(int))
-{
- signal(SIGINT, sighandler);
- signal(SIGALRM, sighandler);
-}
-
-static void sig_handler(int sig)
+static void sig_alrm(int sig)
{
- set_sig_handlers(sig_handler);
-
- if (!threads)
- return;
-
- switch (sig) {
- case SIGALRM:
+ if (threads) {
update_io_ticks();
print_thread_status();
status_timer_arm();
- break;
- default:
+ }
+}
+
+static void sig_int(int sig)
+{
+ if (threads) {
printf("\nfio: terminating on signal %d\n", sig);
fflush(stdout);
terminate_threads(TERMINATE_ALL);
- break;
}
}
+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.
*/
*/
static void cleanup_pending_aio(struct thread_data *td)
{
- struct list_head *entry, *n;
+ struct flist_head *entry, *n;
struct io_u *io_u;
int r;
* now cancel remaining active events
*/
if (td->io_ops->cancel) {
- list_for_each_safe(entry, n, &td->io_u_busylist) {
- io_u = list_entry(entry, struct io_u, list);
+ flist_for_each_safe(entry, n, &td->io_u_busylist) {
+ io_u = flist_entry(entry, struct io_u, list);
/*
* if the io_u isn't in flight, then that generally
* zero read, fail
*/
if (!bytes) {
- td_verror(td, ENODATA, "full resid");
+ td_verror(td, EIO, "full resid");
put_io_u(td, io_u);
break;
}
* zero read, fail
*/
if (!bytes) {
- td_verror(td, ENODATA, "full resid");
+ td_verror(td, EIO, "full resid");
put_io_u(td, io_u);
break;
}
if (check_min_rate(td, &comp_time)) {
if (exitall_on_terminate)
terminate_threads(td->groupid);
- td_verror(td, ENODATA, "check_min_rate");
+ td_verror(td, EIO, "check_min_rate");
break;
}
static void cleanup_io_u(struct thread_data *td)
{
- struct list_head *entry, *n;
+ struct flist_head *entry, *n;
struct io_u *io_u;
- list_for_each_safe(entry, n, &td->io_u_freelist) {
- io_u = list_entry(entry, struct io_u, list);
+ flist_for_each_safe(entry, n, &td->io_u_freelist) {
+ io_u = flist_entry(entry, struct io_u, list);
- list_del(&io_u->list);
+ flist_del(&io_u->list);
free(io_u);
}
return 1;
io_u = malloc(sizeof(*io_u));
memset(io_u, 0, sizeof(*io_u));
- INIT_LIST_HEAD(&io_u->list);
+ INIT_FLIST_HEAD(&io_u->list);
if (!(td->io_ops->flags & FIO_NOIO)) {
io_u->buf = p + max_bs * i;
io_u->index = i;
io_u->flags = IO_U_F_FREE;
- list_add(&io_u->list, &td->io_u_freelist);
+ flist_add(&io_u->list, &td->io_u_freelist);
}
io_u_init_timeout();
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);
- INIT_LIST_HEAD(&td->io_u_requeues);
- INIT_LIST_HEAD(&td->io_log_list);
- INIT_LIST_HEAD(&td->io_hist_list);
+ INIT_FLIST_HEAD(&td->io_u_freelist);
+ INIT_FLIST_HEAD(&td->io_u_busylist);
+ INIT_FLIST_HEAD(&td->io_u_requeues);
+ INIT_FLIST_HEAD(&td->io_log_list);
+ INIT_FLIST_HEAD(&td->io_hist_list);
td->io_hist_tree = RB_ROOT;
td_set_runstate(td, TD_INITIALIZED);
fflush(stdout);
}
- set_sig_handlers(sig_handler);
+ set_sig_handlers();
todo = thread_number;
nr_running = 0;