It's still the same timer and shared, but move it out of
diskutil so we get proper status reporting on non-Linux.
We also need to rearm the signal handlers on each signal.
Move this to sigaction() next.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
#include "fio.h"
static int last_majdev, last_mindev;
#include "fio.h"
static int last_majdev, last_mindev;
-static struct itimerval itimer;
static struct list_head disk_list = LIST_HEAD_INIT(disk_list);
static struct list_head disk_list = LIST_HEAD_INIT(disk_list);
__init_disk_util(td, f);
}
__init_disk_util(td, f);
}
-void disk_util_timer_arm(void)
-{
- itimer.it_value.tv_sec = 0;
- itimer.it_value.tv_usec = DISK_UTIL_MSEC * 1000;
- setitimer(ITIMER_REAL, &itimer, NULL);
-}
-
void show_disk_util(void)
{
struct disk_util_stat *dus;
void show_disk_util(void)
{
struct disk_util_stat *dus;
static struct fio_mutex *startup_mutex;
static volatile int fio_abort;
static int exit_value;
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];
struct io_log *agg_io_log[2];
+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);
+}
+
+/*
+ * 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_handler(int sig)
{
+ set_sig_handlers(sig_handler);
+
if (!threads)
return;
switch (sig) {
case SIGALRM:
update_io_ticks();
if (!threads)
return;
switch (sig) {
case SIGALRM:
update_io_ticks();
break;
default:
printf("\nfio: terminating on signal %d\n", sig);
break;
default:
printf("\nfio: terminating on signal %d\n", sig);
- signal(SIGINT, sig_handler);
- signal(SIGALRM, sig_handler);
+ set_sig_handlers(sig_handler);
todo = thread_number;
nr_running = 0;
todo = thread_number;
nr_running = 0;
extern void init_disk_util(struct thread_data *);
extern void update_rusage_stat(struct thread_data *);
extern void update_io_ticks(void);
extern void init_disk_util(struct thread_data *);
extern void update_rusage_stat(struct thread_data *);
extern void update_io_ticks(void);
-extern void disk_util_timer_arm(void);
extern void setup_log(struct io_log **);
extern void finish_log(struct thread_data *, struct io_log *, const char *);
extern void __finish_log(struct io_log *, const char *);
extern void setup_log(struct io_log **);
extern void finish_log(struct thread_data *, struct io_log *, const char *);
extern void __finish_log(struct io_log *, const char *);
*/
#ifdef FIO_HAVE_DISK_UTIL
extern void show_disk_util(void);
*/
#ifdef FIO_HAVE_DISK_UTIL
extern void show_disk_util(void);
-extern void disk_util_timer_arm(void);
extern void init_disk_util(struct thread_data *);
extern void update_io_ticks(void);
#else
#define show_disk_util()
extern void init_disk_util(struct thread_data *);
extern void update_io_ticks(void);
#else
#define show_disk_util()
-#define disk_util_timer_arm()
#define init_disk_util(td)
#define update_io_ticks()
#endif
#define init_disk_util(td)
#define update_io_ticks()
#endif