projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation on centos 7
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 334f2036ac0b64646c6d30fdcc3085f0ce6099dd..b58057f72009f9df12fa01879ef4f7df6732a1ef 100644
(file)
--- a/
fio.h
+++ b/
fio.h
@@
-20,7
+20,6
@@
#include "fifo.h"
#include "arch/arch.h"
#include "os/os.h"
#include "fifo.h"
#include "arch/arch.h"
#include "os/os.h"
-#include "mutex.h"
#include "log.h"
#include "debug.h"
#include "file.h"
#include "log.h"
#include "debug.h"
#include "file.h"
@@
-28,6
+27,7
@@
#include "ioengines.h"
#include "iolog.h"
#include "helpers.h"
#include "ioengines.h"
#include "iolog.h"
#include "helpers.h"
+#include "minmax.h"
#include "options.h"
#include "profile.h"
#include "fio_time.h"
#include "options.h"
#include "profile.h"
#include "fio_time.h"
@@
-44,6
+44,7
@@
#include "io_u_queue.h"
#include "workqueue.h"
#include "steadystate.h"
#include "io_u_queue.h"
#include "workqueue.h"
#include "steadystate.h"
+#include "lib/nowarn_snprintf.h"
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
#ifdef CONFIG_SOLARISAIO
#include <sys/asynch.h>
@@
-63,6
+64,8
@@
#include <cuda.h>
#endif
#include <cuda.h>
#endif
+struct fio_sem;
+
/*
* offset generator types
*/
/*
* offset generator types
*/
@@
-77,7
+80,7
@@
enum {
__TD_F_READ_IOLOG,
__TD_F_REFILL_BUFFERS,
__TD_F_SCRAMBLE_BUFFERS,
__TD_F_READ_IOLOG,
__TD_F_REFILL_BUFFERS,
__TD_F_SCRAMBLE_BUFFERS,
- __TD_F_
VER_NONE
,
+ __TD_F_
DO_VERIFY
,
__TD_F_PROFILE_OPS,
__TD_F_COMPRESS,
__TD_F_COMPRESS_LOG,
__TD_F_PROFILE_OPS,
__TD_F_COMPRESS,
__TD_F_COMPRESS_LOG,
@@
-98,7
+101,7
@@
enum {
TD_F_READ_IOLOG = 1U << __TD_F_READ_IOLOG,
TD_F_REFILL_BUFFERS = 1U << __TD_F_REFILL_BUFFERS,
TD_F_SCRAMBLE_BUFFERS = 1U << __TD_F_SCRAMBLE_BUFFERS,
TD_F_READ_IOLOG = 1U << __TD_F_READ_IOLOG,
TD_F_REFILL_BUFFERS = 1U << __TD_F_REFILL_BUFFERS,
TD_F_SCRAMBLE_BUFFERS = 1U << __TD_F_SCRAMBLE_BUFFERS,
- TD_F_
VER_NONE = 1U << __TD_F_VER_NONE
,
+ TD_F_
DO_VERIFY = 1U << __TD_F_DO_VERIFY
,
TD_F_PROFILE_OPS = 1U << __TD_F_PROFILE_OPS,
TD_F_COMPRESS = 1U << __TD_F_COMPRESS,
TD_F_COMPRESS_LOG = 1U << __TD_F_COMPRESS_LOG,
TD_F_PROFILE_OPS = 1U << __TD_F_PROFILE_OPS,
TD_F_COMPRESS = 1U << __TD_F_COMPRESS,
TD_F_COMPRESS_LOG = 1U << __TD_F_COMPRESS_LOG,
@@
-198,7
+201,7
@@
struct thread_data {
struct timespec iops_sample_time;
volatile int update_rusage;
struct timespec iops_sample_time;
volatile int update_rusage;
- struct fio_
mutex
*rusage_sem;
+ struct fio_
sem
*rusage_sem;
struct rusage ru_start;
struct rusage ru_end;
struct rusage ru_start;
struct rusage ru_end;
@@
-228,9
+231,9
@@
struct thread_data {
pid_t pid;
char *orig_buffer;
size_t orig_buffer_size;
pid_t pid;
char *orig_buffer;
size_t orig_buffer_size;
- volatile int terminate;
volatile int runstate;
volatile int runstate;
- unsigned int last_was_sync;
+ volatile bool terminate;
+ bool last_was_sync;
enum fio_ddir last_ddir;
int mmapfd;
enum fio_ddir last_ddir;
int mmapfd;
@@
-341,7
+344,7
@@
struct thread_data {
uint64_t this_io_bytes[DDIR_RWDIR_CNT];
uint64_t io_skip_bytes;
uint64_t zone_bytes;
uint64_t this_io_bytes[DDIR_RWDIR_CNT];
uint64_t io_skip_bytes;
uint64_t zone_bytes;
- struct fio_
mutex *mutex
;
+ struct fio_
sem *sem
;
uint64_t bytes_done[DDIR_RWDIR_CNT];
/*
uint64_t bytes_done[DDIR_RWDIR_CNT];
/*
@@
-396,6
+399,11
@@
struct thread_data {
* For IO replaying
*/
struct flist_head io_log_list;
* For IO replaying
*/
struct flist_head io_log_list;
+ FILE *io_log_rfile;
+ unsigned int io_log_current;
+ unsigned int io_log_checkmark;
+ unsigned int io_log_highmark;
+ struct timespec io_log_highmark_time;
/*
* For tracking/handling discards
/*
* For tracking/handling discards
@@
-403,8
+411,6
@@
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
*/
@@
-468,7
+474,9
@@
enum {
break; \
(td)->error = ____e; \
if (!(td)->first_error) \
break; \
(td)->error = ____e; \
if (!(td)->first_error) \
- snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg)); \
+ nowarn_snprintf(td->verror, sizeof(td->verror), \
+ "file:%s:%d, func=%s, error=%s", \
+ __FILE__, __LINE__, (func), (msg)); \
} while (0)
} while (0)
@@
-530,19
+538,20
@@
extern bool eta_time_within_slack(unsigned int time);
static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u)
{
static inline void fio_ro_check(const struct thread_data *td, struct io_u *io_u)
{
- assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
+ assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)) &&
+ !(io_u->ddir == DDIR_TRIM && !td_trim(td)));
}
#define REAL_MAX_JOBS 4096
}
#define REAL_MAX_JOBS 4096
-static inline
int
should_fsync(struct thread_data *td)
+static inline
bool
should_fsync(struct thread_data *td)
{
if (td->last_was_sync)
{
if (td->last_was_sync)
- return
0
;
+ return
false
;
if (td_write(td) || td->o.override_sync)
if (td_write(td) || td->o.override_sync)
- return
1
;
+ return
true
;
- return
0
;
+ return
false
;
}
/*
}
/*
@@
-564,6
+573,7
@@
extern void fio_fill_default_options(struct thread_data *);
extern int fio_show_option_help(const char *);
extern void fio_options_set_ioengine_opts(struct option *long_options, struct thread_data *td);
extern void fio_options_dup_and_init(struct option *);
extern int fio_show_option_help(const char *);
extern void fio_options_set_ioengine_opts(struct option *long_options, struct thread_data *td);
extern void fio_options_dup_and_init(struct option *);
+extern char *fio_option_dup_subs(const char *);
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 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 *);
@@
-718,35
+728,30
@@
static inline bool option_check_rate(struct thread_data *td, enum fio_ddir ddir)
return false;
}
return false;
}
-static inline bool __should_check_rate(struct thread_data *td,
- enum fio_ddir ddir)
+static inline bool __should_check_rate(struct thread_data *td)
{
return (td->flags & TD_F_CHECK_RATE) != 0;
}
static inline bool should_check_rate(struct thread_data *td)
{
{
return (td->flags & TD_F_CHECK_RATE) != 0;
}
static inline bool should_check_rate(struct thread_data *td)
{
- if (__should_check_rate(td, DDIR_READ) && td->bytes_done[DDIR_READ])
- return true;
- if (__should_check_rate(td, DDIR_WRITE) && td->bytes_done[DDIR_WRITE])
- return true;
- if (__should_check_rate(td, DDIR_TRIM) && td->bytes_done[DDIR_TRIM])
- return true;
+ if (!__should_check_rate(td))
+ return false;
- return
false
;
+ return
ddir_rw_sum(td->bytes_done) != 0
;
}
}
-static inline unsigned
int
td_max_bs(struct thread_data *td)
+static inline unsigned
long long
td_max_bs(struct thread_data *td)
{
{
- unsigned
int
max_bs;
+ unsigned
long long
max_bs;
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
return max(td->o.max_bs[DDIR_TRIM], max_bs);
}
max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
return max(td->o.max_bs[DDIR_TRIM], max_bs);
}
-static inline unsigned
int
td_min_bs(struct thread_data *td)
+static inline unsigned
long long
td_min_bs(struct thread_data *td)
{
{
- unsigned
int
min_bs;
+ unsigned
long long
min_bs;
min_bs = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
return min(td->o.min_bs[DDIR_TRIM], min_bs);
min_bs = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
return min(td->o.min_bs[DDIR_TRIM], min_bs);