projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zbd: Restore zbd_check_swd()
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index f6cfbdd8288230be53136b8ad002439c862118df..bb8bd13bd11f973e616fd3897483e27ec833cbc5 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-47,6
+47,7
@@
#include "rate-submit.h"
#include "helper_thread.h"
#include "pshared.h"
#include "rate-submit.h"
#include "helper_thread.h"
#include "pshared.h"
+#include "zone-dist.h"
static struct fio_sem *startup_sem;
static struct flist_head *cgroup_list;
static struct fio_sem *startup_sem;
static struct flist_head *cgroup_list;
@@
-1592,6
+1593,8
@@
static void *thread_main(void *data)
goto err;
}
goto err;
}
+ td_zone_gen_index(td);
+
/*
* Do this early, we don't want the compress threads to be limited
* to the same CPUs as the IO workers. So do this before we set
/*
* Do this early, we don't want the compress threads to be limited
* to the same CPUs as the IO workers. So do this before we set
@@
-1907,15
+1910,7
@@
err:
close_ioengine(td);
cgroup_shutdown(td, cgroup_mnt);
verify_free_state(td);
close_ioengine(td);
cgroup_shutdown(td, cgroup_mnt);
verify_free_state(td);
-
- if (td->zone_state_index) {
- int i;
-
- for (i = 0; i < DDIR_RWDIR_CNT; i++)
- free(td->zone_state_index[i]);
- free(td->zone_state_index);
- td->zone_state_index = NULL;
- }
+ td_zone_free_index(td);
if (fio_option_is_set(o, cpumask)) {
ret = fio_cpuset_exit(&o->cpumask);
if (fio_option_is_set(o, cpumask)) {
ret = fio_cpuset_exit(&o->cpumask);
@@
-2218,18
+2213,22
@@
static void run_threads(struct sk_out *sk_out)
}
if (output_format & FIO_OUTPUT_NORMAL) {
}
if (output_format & FIO_OUTPUT_NORMAL) {
- log_info("Starting ");
+ struct buf_output out;
+
+ buf_output_init(&out);
+ __log_buf(&out, "Starting ");
if (nr_thread)
if (nr_thread)
-
log_info(
"%d thread%s", nr_thread,
+
__log_buf(&out,
"%d thread%s", nr_thread,
nr_thread > 1 ? "s" : "");
if (nr_process) {
if (nr_thread)
nr_thread > 1 ? "s" : "");
if (nr_process) {
if (nr_thread)
-
log_info(
" and ");
-
log_info(
"%d process%s", nr_process,
+
__log_buf(&out,
" and ");
+
__log_buf(&out,
"%d process%s", nr_process,
nr_process > 1 ? "es" : "");
}
nr_process > 1 ? "es" : "");
}
- log_info("\n");
- log_info_flush();
+ __log_buf(&out, "\n");
+ log_info_buf(out.buf, out.buflen);
+ buf_output_free(&out);
}
todo = thread_number;
}
todo = thread_number;
@@
-2486,6
+2485,8
@@
int fio_backend(struct sk_out *sk_out)
}
startup_sem = fio_sem_init(FIO_SEM_LOCKED);
}
startup_sem = fio_sem_init(FIO_SEM_LOCKED);
+ if (!sk_out)
+ is_local_backend = true;
if (startup_sem == NULL)
return 1;
if (startup_sem == NULL)
return 1;