Move the lib/ stuff around a bit

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 25d05bdc373fb7b5b8ec4128797dedb29c36b24c..b8847a5cbb3d39553b3fa6492c6bdf6a90dd0bed 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -378,10 +378,14 @@ struct thread_stat {
         * IO depth and latency stats
         */
        unsigned int io_u_map[FIO_IO_U_MAP_NR];
+       unsigned int io_u_submit[FIO_IO_U_MAP_NR];
+       unsigned int io_u_complete[FIO_IO_U_MAP_NR];
        unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR];
        unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
        unsigned long total_io_u[2];
        unsigned long short_io_u[2];
+       unsigned long total_submit;
+       unsigned long total_complete;
 
        unsigned long long io_bytes[2];
        unsigned long runtime[2];
@@ -909,6 +913,8 @@ 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 *, unsigned int);
 extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int);
+void io_u_mark_complete(struct thread_data *, unsigned int);
+void io_u_mark_submit(struct thread_data *, unsigned int);
 
 /*
  * io engine entry points
@@ -1000,7 +1006,8 @@ static inline void dprint_io_u(struct io_u *io_u, const char *p)
        struct fio_file *f = io_u->file;
 
        dprint(FD_IO, "%s: io_u %p: off=%llu/len=%lu/ddir=%d", p, io_u,
-                                       io_u->offset, io_u->buflen, io_u->ddir);
+                                       (unsigned long long) io_u->offset,
+                                       io_u->buflen, io_u->ddir);
        if (fio_debug & (1 << FD_IO)) {
                if (f)
                        log_info("/%s", f->file_name);