projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: add --enable-gfio
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 43ad765821ce8d3a100902b40c62482b7a7aa92c..db08aff8bdfcc07cbe51981b0380f67f1e064925 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-42,15
+42,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
#include <sys/asynch.h>
#endif
#ifdef FIO_HAVE_SOLARISAIO
#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>
@@
-68,7
+64,6
@@
enum {
RW_SEQ_IDENT,
};
RW_SEQ_IDENT,
};
-
enum {
TD_F_VER_BACKLOG = 1,
TD_F_TRIM_BACKLOG = 2,
enum {
TD_F_VER_BACKLOG = 1,
TD_F_TRIM_BACKLOG = 2,
@@
-79,6
+74,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.
*/
@@
-138,7
+145,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;
@@
-266,6
+273,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
*/
@@
-345,6
+354,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;
@@
-545,7
+555,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;