Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 22d670ef1cacb02e708a53b6fe804725970e7dd8..c9fa6a9fa8672b5af02181cced08bd17189882f0 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -342,6 +342,8 @@ struct fio_file {
 
        int references;
        enum fio_file_flags flags;
 
        int references;
        enum fio_file_flags flags;

+
+       struct disk_util *du;

 };
 
 /*
 };
 
 /*


@@ -785,8 +787,29 @@ struct disk_util {
 
        unsigned long msec;
        struct timeval time;
 
        unsigned long msec;
        struct timeval time;

+
+       struct fio_mutex *lock;
+       unsigned long users;

 };
 
 };
 

+static inline void disk_util_inc(struct disk_util *du)
+{
+       if (du) {
+               fio_mutex_down(du->lock);
+               du->users++;
+               fio_mutex_up(du->lock);
+       }
+}
+
+static inline void disk_util_dec(struct disk_util *du)
+{
+       if (du) {
+               fio_mutex_down(du->lock);
+               du->users--;
+               fio_mutex_up(du->lock);
+       }
+}
+

 #define DISK_UTIL_MSEC (250)
 
 /*
 #define DISK_UTIL_MSEC (250)
 
 /*