projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop the only local variable declaration within a for-loop (C99)
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index b2f0e2f5853a54985ca5baf1e17a8d5198e2d040..b67613e6d10bdcb4309e9df6c14f7dbae9cc2f1e 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-25,7
+25,7
@@
#include "debug.h"
#include "file.h"
#include "io_ddir.h"
#include "debug.h"
#include "file.h"
#include "io_ddir.h"
-#include "ioengine.h"
+#include "ioengine
s
.h"
#include "iolog.h"
#include "helpers.h"
#include "options.h"
#include "iolog.h"
#include "helpers.h"
#include "options.h"
@@
-35,10
+35,12
@@
#include "oslib/getopt.h"
#include "lib/rand.h"
#include "lib/rbtree.h"
#include "oslib/getopt.h"
#include "lib/rand.h"
#include "lib/rbtree.h"
+#include "lib/num2str.h"
#include "client.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
#include "client.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
+#include "io_u.h"
#include "io_u_queue.h"
#include "workqueue.h"
#include "steadystate.h"
#include "io_u_queue.h"
#include "workqueue.h"
#include "steadystate.h"
@@
-74,7
+76,7
@@
enum {
TD_F_VER_NONE = 1U << 5,
TD_F_PROFILE_OPS = 1U << 6,
TD_F_COMPRESS = 1U << 7,
TD_F_VER_NONE = 1U << 5,
TD_F_PROFILE_OPS = 1U << 6,
TD_F_COMPRESS = 1U << 7,
- TD_F_
NOIO = 1U << 8,
+ TD_F_
RESERVED = 1U << 8, /* not used */
TD_F_COMPRESS_LOG = 1U << 9,
TD_F_VSTATE_SAVED = 1U << 10,
TD_F_NEED_LOCK = 1U << 11,
TD_F_COMPRESS_LOG = 1U << 9,
TD_F_VSTATE_SAVED = 1U << 10,
TD_F_NEED_LOCK = 1U << 11,
@@
-99,6
+101,8
@@
enum {
FIO_DEDUPE_OFF,
FIO_RAND_POISSON_OFF,
FIO_RAND_ZONE_OFF,
FIO_DEDUPE_OFF,
FIO_RAND_POISSON_OFF,
FIO_RAND_ZONE_OFF,
+ FIO_RAND_POISSON2_OFF,
+ FIO_RAND_POISSON3_OFF,
FIO_RAND_NR_OFFS,
};
FIO_RAND_NR_OFFS,
};
@@
-121,7
+125,6
@@
enum {
* Per-thread/process specific data. Only used for the network client
* for now.
*/
* Per-thread/process specific data. Only used for the network client
* for now.
*/
-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);
@@
-231,6
+234,7
@@
struct thread_data {
* to any of the available IO engines.
*/
struct ioengine_ops *io_ops;
* to any of the available IO engines.
*/
struct ioengine_ops *io_ops;
+ int io_ops_init;
/*
* IO engine private data and dlhandle.
/*
* IO engine private data and dlhandle.
@@
-280,8
+284,8
@@
struct thread_data {
unsigned long rate_blocks[DDIR_RWDIR_CNT];
unsigned long long rate_io_issue_bytes[DDIR_RWDIR_CNT];
struct timeval lastrate[DDIR_RWDIR_CNT];
unsigned long rate_blocks[DDIR_RWDIR_CNT];
unsigned long long rate_io_issue_bytes[DDIR_RWDIR_CNT];
struct timeval lastrate[DDIR_RWDIR_CNT];
- int64_t last_usec;
- struct frand_state poisson_state;
+ int64_t last_usec
[DDIR_RWDIR_CNT]
;
+ struct frand_state poisson_state
[DDIR_RWDIR_CNT]
;
/*
* Enforced rate submission/completion workqueue
/*
* Enforced rate submission/completion workqueue
@@
-490,7
+494,7
@@
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_write(td) || td
_rw(td) || td
->o.override_sync)
+ if (td_write(td) || td->o.override_sync)
return 1;
return 0;
return 1;
return 0;
@@
-519,7
+523,6
@@
extern void fio_options_mem_dupe(struct thread_data *);
extern void td_fill_rand_seeds(struct thread_data *);
extern void td_fill_verify_state_seed(struct thread_data *);
extern void add_job_opts(const char **, int);
extern void td_fill_rand_seeds(struct thread_data *);
extern void td_fill_verify_state_seed(struct thread_data *);
extern void add_job_opts(const char **, int);
-extern char *num2str(uint64_t, int, int, int, int);
extern int ioengine_load(struct thread_data *);
extern bool parse_dryrun(void);
extern int fio_running_or_pending_io_threads(void);
extern int ioengine_load(struct thread_data *);
extern bool parse_dryrun(void);
extern int fio_running_or_pending_io_threads(void);
@@
-532,13
+535,6
@@
extern uintptr_t page_size;
extern int initialize_fio(char *envp[]);
extern void deinitialize_fio(void);
extern int initialize_fio(char *envp[]);
extern void deinitialize_fio(void);
-#define N2S_NONE 0
-#define N2S_BITPERSEC 1 /* match unit_base for bit rates */
-#define N2S_PERSEC 2
-#define N2S_BIT 3
-#define N2S_BYTE 4
-#define N2S_BYTEPERSEC 8 /* match unit_base for byte rates */
-
#define FIO_GETOPT_JOB 0x89000000
#define FIO_GETOPT_IOENGINE 0x98000000
#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128)
#define FIO_GETOPT_JOB 0x89000000
#define FIO_GETOPT_IOENGINE 0x98000000
#define FIO_NR_OPTIONS (FIO_MAX_OPTS + 128)