projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output_buffer: only realloc once, and memset just what we need
[fio.git]
/
workqueue.c
diff --git
a/workqueue.c
b/workqueue.c
index 8f6963f58aaadac55ef37d378f8c7f05c928516e..7a69be21803656a10326c1b525a58502289ee39c 100644
(file)
--- a/
workqueue.c
+++ b/
workqueue.c
@@
-124,6
+124,7
@@
int workqueue_enqueue(struct workqueue *wq, struct io_u *io_u)
if (ddir_rw(ddir)) {
parent->io_issues[ddir]++;
parent->io_issue_bytes[ddir] += io_u->xfer_buflen;
if (ddir_rw(ddir)) {
parent->io_issues[ddir]++;
parent->io_issue_bytes[ddir] += io_u->xfer_buflen;
+ parent->rate_io_issue_bytes[ddir] += io_u->xfer_buflen;
}
pthread_mutex_lock(&sw->lock);
}
pthread_mutex_lock(&sw->lock);
@@
-161,6
+162,7
@@
static int init_submit_worker(struct submit_worker *sw)
memcpy(&td->ts, &parent->ts, sizeof(td->ts));
td->o.uid = td->o.gid = -1U;
dup_files(td, parent);
memcpy(&td->ts, &parent->ts, sizeof(td->ts));
td->o.uid = td->o.gid = -1U;
dup_files(td, parent);
+ td->eo = parent->eo;
fio_options_mem_dupe(td);
if (ioengine_load(td))
fio_options_mem_dupe(td);
if (ioengine_load(td))
@@
-184,7
+186,7
@@
static int init_submit_worker(struct submit_worker *sw)
fio_gettime(&td->epoch, NULL);
fio_getrusage(&td->ru_start);
fio_gettime(&td->epoch, NULL);
fio_getrusage(&td->ru_start);
- clear_io_state(td);
+ clear_io_state(td
, 1
);
td_set_runstate(td, TD_RUNNING);
td->flags |= TD_F_CHILD;
td_set_runstate(td, TD_RUNNING);
td->flags |= TD_F_CHILD;
@@
-197,7
+199,7
@@
err:
return 1;
}
return 1;
}
-#ifdef CONFIG_SFA
+#ifdef CONFIG_SFA
A
static void sum_val(uint64_t *dst, uint64_t *src)
{
if (*src) {
static void sum_val(uint64_t *dst, uint64_t *src)
{
if (*src) {
@@
-218,7
+220,7
@@
static void sum_val(uint64_t *dst, uint64_t *src)
static void sum_ddir(struct thread_data *dst, struct thread_data *src,
enum fio_ddir ddir)
{
static void sum_ddir(struct thread_data *dst, struct thread_data *src,
enum fio_ddir ddir)
{
-#ifndef CONFIG_SFA
+#ifndef CONFIG_SFA
A
pthread_mutex_lock(&dst->io_wq.stat_lock);
pthread_mutex_lock(&src->io_wq.stat_lock);
#endif
pthread_mutex_lock(&dst->io_wq.stat_lock);
pthread_mutex_lock(&src->io_wq.stat_lock);
#endif
@@
-229,7
+231,7
@@
static void sum_ddir(struct thread_data *dst, struct thread_data *src,
sum_val(&dst->this_io_bytes[ddir], &src->this_io_bytes[ddir]);
sum_val(&dst->bytes_done[ddir], &src->bytes_done[ddir]);
sum_val(&dst->this_io_bytes[ddir], &src->this_io_bytes[ddir]);
sum_val(&dst->bytes_done[ddir], &src->bytes_done[ddir]);
-#ifndef CONFIG_SFA
+#ifndef CONFIG_SFA
A
pthread_mutex_unlock(&src->io_wq.stat_lock);
pthread_mutex_unlock(&dst->io_wq.stat_lock);
#endif
pthread_mutex_unlock(&src->io_wq.stat_lock);
pthread_mutex_unlock(&dst->io_wq.stat_lock);
#endif