projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusion between terse and json output
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index 88623bea3d88c97e34c19029849fa31dc81529ef..b5501c63f76df6813f72a3c7bc6a93e90e505aea 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-67,6
+67,7
@@
unsigned int nr_thread = 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)
@@
-812,7
+813,7
@@
static int init_io_u(struct thread_data *td)
td->orig_buffer_size = (unsigned long long) max_bs
* (unsigned long long) max_units;
td->orig_buffer_size = (unsigned long long) max_bs
* (unsigned long long) max_units;
- if ((td->io_ops->flags & FIO_NOIO) || !
td_rw(td
))
+ if ((td->io_ops->flags & FIO_NOIO) || !
(td_read(td) || td_write(td)
))
data_xfer = 0;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
data_xfer = 0;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
@@
-1610,6
+1611,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;