projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add unified_rw_reporting option
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 58364aaf5c74c8338885cd0a59214ee9c1cc01ff..2fd354a94c742d52b210787f5cc8bcb6d0f9fb23 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-40,15
+40,11
@@
struct thread_data;
#include "stat.h"
#include "flow.h"
#include "stat.h"
#include "flow.h"
-#ifdef FIO_HAVE_GUASI
-#include <guasi.h>
-#endif
-
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
#endif
#include <sys/asynch.h>
#endif
-#ifdef
FIO_HAVE
_LIBNUMA
+#ifdef
CONFIG
_LIBNUMA
#include <linux/mempolicy.h>
#include <numa.h>
#include <linux/mempolicy.h>
#include <numa.h>
@@
-153,6
+149,7
@@
struct thread_options {
unsigned int verify;
unsigned int do_verify;
unsigned int verifysort;
unsigned int verify;
unsigned int do_verify;
unsigned int verifysort;
+ unsigned int verifysort_nr;
unsigned int verify_interval;
unsigned int verify_offset;
char verify_pattern[MAX_PATTERN_SIZE];
unsigned int verify_interval;
unsigned int verify_offset;
char verify_pattern[MAX_PATTERN_SIZE];
@@
-162,6
+159,7
@@
struct thread_options {
unsigned int verify_async;
unsigned long long verify_backlog;
unsigned int verify_batch;
unsigned int verify_async;
unsigned long long verify_backlog;
unsigned int verify_batch;
+ unsigned int experimental_verify;
unsigned int use_thread;
unsigned int unlink;
unsigned int do_disk_util;
unsigned int use_thread;
unsigned int unlink;
unsigned int do_disk_util;
@@
-213,7
+211,7
@@
struct thread_options {
unsigned int cpumask_set;
os_cpu_mask_t verify_cpumask;
unsigned int verify_cpumask_set;
unsigned int cpumask_set;
os_cpu_mask_t verify_cpumask;
unsigned int verify_cpumask_set;
-#ifdef
FIO_HAVE
_LIBNUMA
+#ifdef
CONFIG
_LIBNUMA
struct bitmask *numa_cpunodesmask;
unsigned int numa_cpumask_set;
unsigned short numa_mem_mode;
struct bitmask *numa_cpunodesmask;
unsigned int numa_cpumask_set;
unsigned short numa_mem_mode;
@@
-239,6
+237,7
@@
struct thread_options {
unsigned int disable_clat;
unsigned int disable_slat;
unsigned int disable_bw;
unsigned int disable_clat;
unsigned int disable_slat;
unsigned int disable_bw;
+ unsigned int unified_rw_rep;
unsigned int gtod_reduce;
unsigned int gtod_cpu;
unsigned int gtod_offload;
unsigned int gtod_reduce;
unsigned int gtod_cpu;
unsigned int gtod_offload;
@@
-319,6
+318,18
@@
enum {
TD_F_PROFILE_OPS = 64,
};
TD_F_PROFILE_OPS = 64,
};
+enum {
+ FIO_RAND_BS_OFF = 0,
+ FIO_RAND_VER_OFF,
+ FIO_RAND_MIX_OFF,
+ FIO_RAND_FILE_OFF,
+ FIO_RAND_BLOCK_OFF,
+ FIO_RAND_FILE_SIZE_OFF,
+ FIO_RAND_TRIM_OFF,
+ FIO_RAND_BUF_OFF,
+ FIO_RAND_NR_OFFS,
+};
+
/*
* This describes a single thread/process executing a fio job.
*/
/*
* This describes a single thread/process executing a fio job.
*/
@@
-379,7
+390,7
@@
struct thread_data {
char *sysfs_root;
char *sysfs_root;
- unsigned long rand_seeds[
8
];
+ unsigned long rand_seeds[
FIO_RAND_NR_OFFS
];
union {
os_random_state_t bsrange_state;
union {
os_random_state_t bsrange_state;
@@
-507,6
+518,8
@@
struct thread_data {
struct flist_head trim_list;
unsigned long trim_entries;
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
*/
/*
* for fileservice, how often to switch to a new file
*/
@@
-586,6
+599,7
@@
extern char *job_section;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
+extern int fio_clock_source_set;
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
@@
-642,8
+656,6
@@
static inline int should_fsync(struct thread_data *td)
{
if (td->last_was_sync)
return 0;
{
if (td->last_was_sync)
return 0;
- if (td->o.odirect)
- return 0;
if (td_write(td) || td_rw(td) || td->o.override_sync)
return 1;
if (td_write(td) || td_rw(td) || td->o.override_sync)
return 1;
@@
-779,7
+791,7
@@
static inline int __should_check_rate(struct thread_data *td,
}
static inline int should_check_rate(struct thread_data *td,
}
static inline int should_check_rate(struct thread_data *td,
- u
nsigned long
*bytes_done)
+ u
int64_t
*bytes_done)
{
int ret = 0;
{
int ret = 0;