#include <string.h>
#include <getopt.h>
+#include "compiler/compiler.h"
#include "list.h"
#include "rbtree.h"
#include "md5.h"
#include "crc32.h"
-#include "arch.h"
-#include "os.h"
+#include "arch/arch.h"
+#include "os/os.h"
#include "mutex.h"
#ifdef FIO_HAVE_SYSLET
FIO_FILE_OPEN = 1 << 0, /* file is open */
FIO_FILE_UNLINK = 1 << 1, /* unlink on close */
FIO_FILE_CLOSING = 1 << 2, /* file being closed */
- FIO_FILE_EXISTS = 1 << 3, /* no need to create */
- FIO_FILE_NOSORT = 1 << 4, /* don't sort verify blocks */
+ FIO_FILE_EXISTS = 1 << 3, /* file there */
+ FIO_FILE_EXTEND = 1 << 4, /* needs extend */
+ FIO_FILE_NOSORT = 1 << 5, /* don't sort verify blocks */
+ FIO_FILE_DONE = 1 << 6, /* io completed to this file */
+ FIO_SIZE_KNOWN = 1 << 7, /* size has been set */
};
/*
unsigned long file_data;
int fd;
};
+
+ /*
+ * filename and possible memory mapping
+ */
char *file_name;
void *mmap;
- unsigned long long file_size;
+
+ /*
+ * size of the file, offset into file, and io size from that offset
+ */
unsigned long long real_file_size;
unsigned long long file_offset;
+ unsigned long long io_size;
+
unsigned long long last_pos;
unsigned long long last_completed_pos;
struct fio_file *files;
unsigned int files_index;
unsigned int nr_open_files;
+ unsigned int nr_done_files;
unsigned int nr_normal_files;
union {
unsigned int next_file;
unsigned long rate_blocks;
struct timeval lastrate;
- unsigned long long io_size;
unsigned long long total_io_size;
unsigned long io_issues[2];
char *name;
char path[256];
- dev_t dev;
+ int major, minor;
struct disk_util_stat dus;
struct disk_util_stat last_dus;
extern void print_thread_status(void);
extern void print_status_init(int);
+/*
+ * disk util stuff
+ */
+#ifdef FIO_HAVE_DISK_UTIL
+extern void show_disk_util(void);
+extern void disk_util_timer_arm(void);
+extern void init_disk_util(struct thread_data *);
+extern void update_io_ticks(void);
+#else
+#define show_disk_util()
+#define disk_util_timer_arm()
+#define init_disk_util(td)
+#define update_io_ticks()
+#endif
+
/*
* Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it
* will never back again. It may cycle between running/verififying/fsyncing.
void *dlhandle;
};
-#define FIO_IOOPS_VERSION 6
+#define FIO_IOOPS_VERSION 7
extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
extern void register_ioengine(struct ioengine_ops *);
} \
} while (0)
+static inline void clear_error(struct thread_data *td)
+{
+ td->error = 0;
+ td->verror[0] = '\0';
+}
+
#endif