X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=2dc445ee16e9a961c52e2db9b40d55fd2e48c805;hb=2de615ad34e323ec7c8f0f595ed4dc5124f99a42;hp=17bc02bc59f0eba2a39aa40b5b5142407b1bc02b;hpb=50a8ce864e2c5bee7c44935b39b357aa8071615b;p=fio.git diff --git a/fio.h b/fio.h index 17bc02bc..2dc445ee 100644 --- a/fio.h +++ b/fio.h @@ -434,6 +434,7 @@ extern char *trigger_file; extern char *trigger_cmd; extern char *trigger_remote_cmd; extern long long trigger_timeout; +extern char *aux_path; extern struct thread_data *threads; @@ -482,6 +483,7 @@ extern int ioengine_load(struct thread_data *); extern int parse_dryrun(void); extern int fio_running_or_pending_io_threads(void); extern int fio_set_fd_nonblocking(int, const char *); +extern void sig_show_status(int sig); extern uintptr_t page_mask; extern uintptr_t page_size; @@ -667,13 +669,19 @@ extern const char *fio_get_arch_string(int); extern const char *fio_get_os_string(int); #ifdef FIO_INTERNAL -#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0]))) +#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0]))) +#define FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f)) #endif enum { - FIO_OUTPUT_TERSE = 0, - FIO_OUTPUT_JSON, - FIO_OUTPUT_NORMAL, + __FIO_OUTPUT_TERSE = 0, + __FIO_OUTPUT_JSON = 1, + __FIO_OUTPUT_NORMAL = 2, + FIO_OUTPUT_NR = 3, + + FIO_OUTPUT_TERSE = 1U << __FIO_OUTPUT_TERSE, + FIO_OUTPUT_JSON = 1U << __FIO_OUTPUT_JSON, + FIO_OUTPUT_NORMAL = 1U << __FIO_OUTPUT_NORMAL, }; enum {