projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add include-what-you-use pragmas
[fio.git]
/
fio.h
diff --git
a/fio.h
b/fio.h
index b3b95efb1b0ee23ad369efb2586bf87fa8edd1e0..488fa9a62e4e7e10cce59da7517d0a5890bda26f 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"
@@
-63,6
+63,8
@@
#include <cuda.h>
#endif
#include <cuda.h>
#endif
+struct fio_sem;
+
/*
* offset generator types
*/
/*
* offset generator types
*/
@@
-198,7
+200,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
+230,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
+343,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];
/*
@@
-800,11
+802,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,