#include "fifo.h"
#include "arch/arch.h"
#include "os/os.h"
-#include "mutex.h"
#include "log.h"
#include "debug.h"
#include "file.h"
#include "ioengines.h"
#include "iolog.h"
#include "helpers.h"
+#include "minmax.h"
#include "options.h"
#include "profile.h"
#include "fio_time.h"
#include <cuda.h>
#endif
+struct fio_sem;
+
/*
* offset generator types
*/
__TD_F_READ_IOLOG,
__TD_F_REFILL_BUFFERS,
__TD_F_SCRAMBLE_BUFFERS,
- __TD_F_VER_NONE,
+ __TD_F_DO_VERIFY,
__TD_F_PROFILE_OPS,
__TD_F_COMPRESS,
__TD_F_COMPRESS_LOG,
__TD_F_REGROW_LOGS,
__TD_F_MMAP_KEEP,
__TD_F_DIRS_CREATED,
+ __TD_F_CHECK_RATE,
__TD_F_LAST, /* not a real bit, keep last */
};
TD_F_READ_IOLOG = 1U << __TD_F_READ_IOLOG,
TD_F_REFILL_BUFFERS = 1U << __TD_F_REFILL_BUFFERS,
TD_F_SCRAMBLE_BUFFERS = 1U << __TD_F_SCRAMBLE_BUFFERS,
- TD_F_VER_NONE = 1U << __TD_F_VER_NONE,
+ TD_F_DO_VERIFY = 1U << __TD_F_DO_VERIFY,
TD_F_PROFILE_OPS = 1U << __TD_F_PROFILE_OPS,
TD_F_COMPRESS = 1U << __TD_F_COMPRESS,
TD_F_COMPRESS_LOG = 1U << __TD_F_COMPRESS_LOG,
TD_F_REGROW_LOGS = 1U << __TD_F_REGROW_LOGS,
TD_F_MMAP_KEEP = 1U << __TD_F_MMAP_KEEP,
TD_F_DIRS_CREATED = 1U << __TD_F_DIRS_CREATED,
+ TD_F_CHECK_RATE = 1U << __TD_F_CHECK_RATE,
};
enum {
struct timespec iops_sample_time;
volatile int update_rusage;
- struct fio_mutex *rusage_sem;
+ struct fio_sem *rusage_sem;
struct rusage ru_start;
struct rusage ru_end;
unsigned int files_index;
unsigned int nr_open_files;
unsigned int nr_done_files;
- unsigned int nr_normal_files;
union {
unsigned int next_file;
struct frand_state next_file_state;
pid_t pid;
char *orig_buffer;
size_t orig_buffer_size;
- volatile int terminate;
volatile int runstate;
- unsigned int last_was_sync;
+ volatile bool terminate;
+ bool last_was_sync;
enum fio_ddir last_ddir;
int mmapfd;
uint64_t this_io_bytes[DDIR_RWDIR_CNT];
uint64_t io_skip_bytes;
uint64_t zone_bytes;
- struct fio_mutex *mutex;
+ struct fio_sem *sem;
uint64_t bytes_done[DDIR_RWDIR_CNT];
/*
struct flist_head trim_list;
unsigned long trim_entries;
- struct flist_head next_rand_list;
-
/*
* for fileservice, how often to switch to a new file
*/
extern int read_only;
extern int eta_print;
extern int eta_new_line;
+extern unsigned int eta_interval_msec;
extern unsigned long done_secs;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern struct thread_data *threads;
+extern bool eta_time_within_slack(unsigned int time);
+
static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u)
{
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
TD_NR,
};
-#define TD_ENG_FLAG_SHIFT 16
-#define TD_ENG_FLAG_MASK ((1U << 16) - 1)
+#define TD_ENG_FLAG_SHIFT 17
+#define TD_ENG_FLAG_MASK ((1U << 17) - 1)
static inline void td_set_ioengine_flags(struct thread_data *td)
{
return false;
}
-static inline bool __should_check_rate(struct thread_data *td,
- enum fio_ddir ddir)
+static inline bool option_check_rate(struct thread_data *td, enum fio_ddir ddir)
{
struct thread_options *o = &td->o;
return false;
}
+static inline bool __should_check_rate(struct thread_data *td,
+ enum fio_ddir ddir)
+{
+ return (td->flags & TD_F_CHECK_RATE) != 0;
+}
+
static inline bool should_check_rate(struct thread_data *td)
{
- if (td->bytes_done[DDIR_READ] && __should_check_rate(td, DDIR_READ))
+ if (__should_check_rate(td, DDIR_READ) && td->bytes_done[DDIR_READ])
return true;
- if (td->bytes_done[DDIR_WRITE] && __should_check_rate(td, DDIR_WRITE))
+ if (__should_check_rate(td, DDIR_WRITE) && td->bytes_done[DDIR_WRITE])
return true;
- if (td->bytes_done[DDIR_TRIM] && __should_check_rate(td, DDIR_TRIM))
+ if (__should_check_rate(td, DDIR_TRIM) && td->bytes_done[DDIR_TRIM])
return true;
return false;
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 FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f))
-#endif
-
enum {
__FIO_OUTPUT_TERSE = 0,
__FIO_OUTPUT_JSON = 1,