Merge branch 'master' into gfio

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 586eac878ff3f46f63ae675208d74388715401d1..3a1df299fd80f920ee97d8f1ecb79b525726a838 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -67,6 +67,7 @@ unsigned int thread_number = 0;
 int shm_id = 0;
 int temp_stall_ts;
 unsigned long done_secs = 0;
 int shm_id = 0;
 int temp_stall_ts;
 unsigned long done_secs = 0;

+volatile int disk_util_exit = 0;

 
 #define PAGE_ALIGN(buf)        \
        (char *) (((uintptr_t) (buf) + page_mask) & ~page_mask)
 
 #define PAGE_ALIGN(buf)        \
        (char *) (((uintptr_t) (buf) + page_mask) & ~page_mask)


@@ -1621,6 +1622,13 @@ void wait_for_disk_thread_exit(void)
        fio_mutex_down(disk_thread_mutex);
 }
 
        fio_mutex_down(disk_thread_mutex);
 }
 

+static void free_disk_util(void)
+{
+       disk_util_start_exit();
+       wait_for_disk_thread_exit();
+       disk_util_prune_entries();
+}
+

 static void *disk_thread_main(void *data)
 {
        int ret = 0;
 static void *disk_thread_main(void *data)
 {
        int ret = 0;