#include "crc32.h"
#include "arch.h"
#include "os.h"
+#include "mutex.h"
#ifdef FIO_HAVE_SYSLET
#include "syslet.h"
enum fio_ioengine_flags {
FIO_SYNCIO = 1 << 0, /* io engine has synchronous ->queue */
- FIO_CPUIO = 1 << 1, /* cpu burner, doesn't do real io */
- FIO_MMAPIO = 1 << 2, /* uses memory mapped io */
- FIO_RAWIO = 1 << 3, /* some sort of direct/raw io */
- FIO_DISKLESSIO = 1 << 4, /* no disk involved */
- FIO_SELFOPEN = 1 << 5, /* opens its own devices */
+ FIO_RAWIO = 1 << 1, /* some sort of direct/raw io */
+ FIO_DISKLESSIO = 1 << 2, /* no disk involved */
+ FIO_NOEXTEND = 1 << 3, /* engine can't extend file */
+ FIO_NODISKUTIL = 1 << 4, /* diskutil can't handle filename */
};
/*
unsigned int last_free_lookup;
unsigned int unlink;
+ unsigned int open;
};
/*
#define FIO_IO_U_LAT_NR 12
struct thread_stat {
+ char *name;
+ char *verror;
+ int error;
+ int groupid;
+ pid_t pid;
+ char *description;
+ int members;
+
struct io_log *slat_log;
struct io_log *clat_log;
struct io_log *bw_log;
*/
unsigned int io_u_map[FIO_IO_U_MAP_NR];
unsigned int io_u_lat[FIO_IO_U_LAT_NR];
- unsigned long total_io_u;
+ unsigned long total_io_u[2];
+
+ unsigned long long io_bytes[2];
+ unsigned long runtime[2];
+ unsigned long total_run_time;
};
/*
char *name;
char *directory;
char *filename;
+ char *ioengine;
char verror[128];
pthread_t thread;
int thread_number;
int groupid;
- struct thread_stat *ts;
- struct thread_stat __ts;
+ struct thread_stat ts;
enum fio_filetype filetype;
struct fio_file *files;
unsigned int nr_files;
unsigned int nice;
unsigned int file_service_type;
unsigned int group_reporting;
+ unsigned int open_files;
char *read_iolog_file;
char *write_iolog_file;
unsigned long rate_bytes;
struct timeval lastrate;
- unsigned long runtime[2]; /* msec */
unsigned long long io_size;
unsigned long long total_file_size;
unsigned long long start_offset;
unsigned long long io_bytes[2];
unsigned long long this_io_bytes[2];
unsigned long long zone_bytes;
- volatile int mutex;
+ struct fio_sem *mutex;
/*
* State for random io, a bitmap of blocks done vs not done
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
- struct timeval end_time;/* time job ended */
/*
* read/write mixed workload state
*/
struct timeval timeout_end;
struct itimerval timer;
+
+ /*
+ * for fileservice, how often to switch to a new file
+ */
+ unsigned int file_service_nr;
+ unsigned int file_service_left;
+ struct fio_file *file_service_file;
};
/*
extern int exitall_on_terminate;
extern int thread_number;
+extern int nr_process, nr_thread;
extern int shm_id;
extern int groupid;
extern int terse_output;
extern void close_files(struct thread_data *);
extern int __must_check setup_files(struct thread_data *);
extern int __must_check open_files(struct thread_data *);
-extern int open_file(struct thread_data *, struct fio_file *, int, int);
-extern void close_file(struct thread_data *, struct fio_file *);
extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
+extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
+extern void generic_close_file(struct thread_data *, struct fio_file *);
/*
* ETA/status stuff
extern void io_u_log_error(struct thread_data *, struct io_u *);
extern void io_u_init_timeout(void);
extern void io_u_set_timeout(struct thread_data *);
+extern void io_u_mark_depth(struct thread_data *, struct io_u *);
/*
* io engine entry points
extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
extern int __must_check td_io_getevents(struct thread_data *, int, int, struct timespec *);
extern int __must_check td_io_commit(struct thread_data *);
-
-/*
- * This is a pretty crappy semaphore implementation, but with the use that fio
- * has (just signalling start/go conditions), it doesn't have to be better.
- * Naturally this would not work for any type of contended semaphore or
- * for real locking.
- */
-static inline void fio_sem_init(volatile int *sem, int val)
-{
- *sem = val;
-}
-
-static inline void fio_sem_down(volatile int *sem)
-{
- while (*sem == 0)
- usleep(10000);
-
- (*sem)--;
-}
-
-static inline void fio_sem_up(volatile int *sem)
-{
- (*sem)++;
-}
+extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
+extern void td_io_close_file(struct thread_data *, struct fio_file *);
/*
* If logging output to a file, stderr should go to both stderr and f_err
struct io_u *(*event)(struct thread_data *, int);
int (*cancel)(struct thread_data *, struct io_u *);
void (*cleanup)(struct thread_data *);
+ int (*open_file)(struct thread_data *, struct fio_file *);
+ void (*close_file)(struct thread_data *, struct fio_file *);
void *data;
void *dlhandle;
- unsigned long priv;
};
-#define FIO_IOOPS_VERSION 5
+#define FIO_IOOPS_VERSION 6
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern void register_ioengine(struct ioengine_ops *);
#define for_each_td(td, i) \
for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
#define for_each_file(td, f, i) \
- for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f)++)
+ for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->open_files; (i)++, (f)++)
#define fio_assert(td, cond) do { \
if (!(cond)) { \
projects / fio.git / blobdiff