projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 3de3f000983a5621ee65c2e8d975e250d0ace7cf..d7eb6dea65a68c3b312025ea1c342ecb5e3da249 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;
@@
-249,7
+248,7
@@
struct thread_options {
unsigned int trim_zero;
unsigned long long trim_backlog;
unsigned int clat_percentiles;
unsigned int trim_zero;
unsigned long long trim_backlog;
unsigned int clat_percentiles;
- unsigned int
overwrite_plist;
+ unsigned int
percentile_precision; /* digits after decimal for percentiles */
fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
char *read_iolog_file;
fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
char *read_iolog_file;
@@
-519,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
*/
@@
-567,7
+568,7
@@
enum {
int e = (err); \
(td)->error = e; \
if (!(td)->first_error) \
int e = (err); \
(td)->error = e; \
if (!(td)->first_error) \
- snprintf(td->verror, sizeof(td->verror)
- 1, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));
\
+ snprintf(td->verror, sizeof(td->verror)
, "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));
\
} while (0)
} while (0)
@@
-593,18
+594,19
@@
extern unsigned long long mlock_size;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int eta_print;
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int eta_print;
+extern int eta_new_line;
extern unsigned long done_secs;
extern char *job_section;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern enum fio_cs fio_clock_source;
extern unsigned long done_secs;
extern char *job_section;
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 nr_clients;
extern int log_syslog;
extern const char fio_version_string[];
extern int warnings_fatal;
extern int terse_version;
extern int is_backend;
extern int nr_clients;
extern int log_syslog;
extern const char fio_version_string[];
-extern const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN];
extern struct thread_data *threads;
extern struct thread_data *threads;
@@
-654,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;
@@
-791,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;