projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'make-nowarn-snprintf-call-va-end' of https://github.com/bvanassche/fio
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index 8a65646134e0d5c8916b4c88df4bb381540bf326..6c897fc6fe9e9a4cad5473e1c0641305772a4136 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];
/*
@@
-403,8
+406,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
+469,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)
@@
-505,6
+508,7
@@
extern uintptr_t page_mask, page_size;
extern int read_only;
extern int eta_print;
extern int eta_new_line;
extern int read_only;
extern int eta_print;
extern int eta_new_line;
+extern unsigned int eta_interval_msec;
extern unsigned long done_secs;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
extern unsigned long done_secs;
extern int fio_gtod_offload;
extern int fio_gtod_cpu;
@@
-525,6
+529,8
@@
extern char *aux_path;
extern struct thread_data *threads;
extern struct thread_data *threads;
+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)
{
assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
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)));
@@
-797,11
+803,6
@@
static inline void td_flags_set(struct thread_data *td, unsigned int *flags,
extern const char *fio_get_arch_string(int);
extern const char *fio_get_os_string(int);
extern const char *fio_get_arch_string(int);
extern const char *fio_get_os_string(int);
-#ifdef FIO_INTERNAL
-#define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0])))
-#define FIELD_SIZE(s, f) (sizeof(((typeof(s))0)->f))
-#endif
-
enum {
__FIO_OUTPUT_TERSE = 0,
__FIO_OUTPUT_JSON = 1,
enum {
__FIO_OUTPUT_TERSE = 0,
__FIO_OUTPUT_JSON = 1,