projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'logging'
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 66211e9da74d80cafc2398ddf001ed8ff0499a8c..20ff26fcac6dd3c8e606e6356bce915b2ad3d17f 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-32,7
+32,7
@@
#include "profile.h"
#include "fio_time.h"
#include "gettime.h"
#include "profile.h"
#include "fio_time.h"
#include "gettime.h"
-#include "lib/getopt.h"
+#include "
os
lib/getopt.h"
#include "lib/rand.h"
#include "lib/rbtree.h"
#include "client.h"
#include "lib/rand.h"
#include "lib/rbtree.h"
#include "client.h"
@@
-96,6
+96,7
@@
enum {
FIO_RAND_START_DELAY,
FIO_DEDUPE_OFF,
FIO_RAND_POISSON_OFF,
FIO_RAND_START_DELAY,
FIO_DEDUPE_OFF,
FIO_RAND_POISSON_OFF,
+ FIO_RAND_ZONE_OFF,
FIO_RAND_NR_OFFS,
};
FIO_RAND_NR_OFFS,
};
@@
-115,6
+116,11
@@
struct sk_out;
void sk_out_assign(struct sk_out *);
void sk_out_drop(void);
void sk_out_assign(struct sk_out *);
void sk_out_drop(void);
+struct zone_split_index {
+ uint8_t size_perc;
+ uint8_t size_perc_prev;
+};
+
/*
* This describes a single thread/process executing a fio job.
*/
/*
* This describes a single thread/process executing a fio job.
*/
@@
-148,13
+154,6
@@
struct thread_data {
uint64_t stat_io_blocks[DDIR_RWDIR_CNT];
struct timeval iops_sample_time;
uint64_t stat_io_blocks[DDIR_RWDIR_CNT];
struct timeval iops_sample_time;
- /*
- * Tracks the last iodepth number of completed writes, if data
- * verification is enabled
- */
- uint64_t *last_write_comp;
- unsigned int last_write_idx;
-
volatile int update_rusage;
struct fio_mutex *rusage_sem;
struct rusage ru_start;
volatile int update_rusage;
struct fio_mutex *rusage_sem;
struct rusage ru_start;
@@
-200,6
+199,9
@@
struct thread_data {
struct frand_state buf_state;
struct frand_state buf_state_prev;
struct frand_state dedupe_state;
struct frand_state buf_state;
struct frand_state buf_state_prev;
struct frand_state dedupe_state;
+ struct frand_state zone_state;
+
+ struct zone_split_index **zone_state_index;
unsigned int verify_batch;
unsigned int trim_batch;
unsigned int verify_batch;
unsigned int trim_batch;
@@
-443,8
+445,6
@@
extern int nr_clients;
extern int log_syslog;
extern int status_interval;
extern const char fio_version_string[];
extern int log_syslog;
extern int status_interval;
extern const char fio_version_string[];
-extern int helper_do_stat;
-extern pthread_cond_t helper_cond;
extern char *trigger_file;
extern char *trigger_cmd;
extern char *trigger_remote_cmd;
extern char *trigger_file;
extern char *trigger_cmd;
extern char *trigger_remote_cmd;
@@
-712,6
+712,7
@@
enum {
FIO_RAND_DIST_ZIPF,
FIO_RAND_DIST_PARETO,
FIO_RAND_DIST_GAUSS,
FIO_RAND_DIST_ZIPF,
FIO_RAND_DIST_PARETO,
FIO_RAND_DIST_GAUSS,
+ FIO_RAND_DIST_ZONED,
};
#define FIO_DEF_ZIPF 1.1
};
#define FIO_DEF_ZIPF 1.1
@@
-731,4
+732,8
@@
enum {
extern void exec_trigger(const char *);
extern void check_trigger_file(void);
extern void exec_trigger(const char *);
extern void check_trigger_file(void);
+extern void helper_reset(void);
+extern void helper_do_stat(void);
+extern bool helper_should_exit(void);
+
#endif
#endif