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 ce0a0098299294279ea4bf16dfd88b7079d9466e..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)
@@
-337,17
+338,17
@@
static int break_on_this_error(struct thread_data *td, enum fio_ddir ddir,
int ret = *retptr;
if (ret < 0 || td->error) {
int ret = *retptr;
if (ret < 0 || td->error) {
- int err;
+ int err = td->error;
+ enum error_type_bit eb;
if (ret < 0)
err = -ret;
if (ret < 0)
err = -ret;
- else
- err = td->error;
- if (!(td->o.continue_on_error & td_error_type(ddir, err)))
+ eb = td_error_type(ddir, err);
+ if (!(td->o.continue_on_error & (1 << eb)))
return 1;
return 1;
- if (td_non_fatal_error(err)) {
+ if (td_non_fatal_error(
td, eb,
err)) {
/*
* Continue with the I/Os in case of
* a non fatal error.
/*
* Continue with the I/Os in case of
* a non fatal error.
@@
-802,6
+803,7
@@
static int init_io_u(struct thread_data *td)
struct io_u *io_u;
unsigned int max_bs, min_write;
int cl_align, i, max_units;
struct io_u *io_u;
unsigned int max_bs, min_write;
int cl_align, i, max_units;
+ int data_xfer = 1;
char *p;
max_units = td->o.iodepth;
char *p;
max_units = td->o.iodepth;
@@
-811,6
+813,9
@@
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_read(td) || td_write(td)))
+ data_xfer = 0;
+
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
unsigned long bs;
if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE) {
unsigned long bs;
@@
-823,7
+828,7
@@
static int init_io_u(struct thread_data *td)
return 1;
}
return 1;
}
- if (allocate_io_mem(td))
+ if (
data_xfer &&
allocate_io_mem(td))
return 1;
if (td->o.odirect || td->o.mem_align ||
return 1;
if (td->o.odirect || td->o.mem_align ||
@@
-851,7
+856,7
@@
static int init_io_u(struct thread_data *td)
INIT_FLIST_HEAD(&io_u->list);
dprint(FD_MEM, "io_u alloc %p, index %u\n", io_u, i);
INIT_FLIST_HEAD(&io_u->list);
dprint(FD_MEM, "io_u alloc %p, index %u\n", io_u, i);
- if (
!(td->io_ops->flags & FIO_NOIO)
) {
+ if (
data_xfer
) {
io_u->buf = p;
dprint(FD_MEM, "io_u %p, mem %p\n", io_u, io_u->buf);
io_u->buf = p;
dprint(FD_MEM, "io_u %p, mem %p\n", io_u, io_u->buf);
@@
-1606,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;