projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ioengines: Fix td->io_issues[ddir] over decrement
[fio.git]
/
iolog.c
diff --git
a/iolog.c
b/iolog.c
index ee1999a0da72124cbc0bb40e4125a9d54c3feb79..f0ce3b25002d0d01e5a671068f32199af9502017 100644
(file)
--- a/
iolog.c
+++ b/
iolog.c
@@
-346,7
+346,7
@@
static int read_iolog2(struct thread_data *td, FILE *f)
unsigned long long offset;
unsigned int bytes;
int reads, writes, waits, fileno = 0, file_action = 0; /* stupid gcc */
unsigned long long offset;
unsigned int bytes;
int reads, writes, waits, fileno = 0, file_action = 0; /* stupid gcc */
- char *fname, *act;
+ char *
rfname, *
fname, *act;
char *str, *p;
enum fio_ddir rw;
char *str, *p;
enum fio_ddir rw;
@@
-357,7
+357,7
@@
static int read_iolog2(struct thread_data *td, FILE *f)
* for doing verifications.
*/
str = malloc(4096);
* for doing verifications.
*/
str = malloc(4096);
- fname = malloc(256+16);
+
rfname =
fname = malloc(256+16);
act = malloc(256+16);
reads = writes = waits = 0;
act = malloc(256+16);
reads = writes = waits = 0;
@@
-365,8
+365,12
@@
static int read_iolog2(struct thread_data *td, FILE *f)
struct io_piece *ipo;
int r;
struct io_piece *ipo;
int r;
- r = sscanf(p, "%256s %256s %llu %u", fname, act, &offset,
+ r = sscanf(p, "%256s %256s %llu %u",
r
fname, act, &offset,
&bytes);
&bytes);
+
+ if (td->o.replay_redirect)
+ fname = td->o.replay_redirect;
+
if (r == 4) {
/*
* Check action first
if (r == 4) {
/*
* Check action first
@@
-421,6
+425,8
@@
static int read_iolog2(struct thread_data *td, FILE *f)
continue;
writes++;
} else if (rw == DDIR_WAIT) {
continue;
writes++;
} else if (rw == DDIR_WAIT) {
+ if (td->o.no_stall)
+ continue;
waits++;
} else if (rw == DDIR_INVAL) {
} else if (!ddir_sync(rw)) {
waits++;
} else if (rw == DDIR_INVAL) {
} else if (!ddir_sync(rw)) {
@@
-451,7
+457,7
@@
static int read_iolog2(struct thread_data *td, FILE *f)
free(str);
free(act);
free(str);
free(act);
- free(fname);
+ free(
r
fname);
if (writes && read_only) {
log_err("fio: <%s> skips replay of %d writes due to"
if (writes && read_only) {
log_err("fio: <%s> skips replay of %d writes due to"
@@
-596,7
+602,7
@@
void setup_log(struct io_log **log, struct log_params *p,
* with initial io_u_plat of all zeros:
*/
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
* with initial io_u_plat of all zeros:
*/
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
- list = &l->hist_window[i].list
.list
;
+ list = &l->hist_window[i].list;
INIT_FLIST_HEAD(list);
entry = calloc(1, sizeof(struct io_u_plat_entry));
flist_add(&entry->list, list);
INIT_FLIST_HEAD(list);
entry = calloc(1, sizeof(struct io_u_plat_entry));
flist_add(&entry->list, list);
@@
-674,20
+680,25
@@
void free_log(struct io_log *log)
sfree(log);
}
sfree(log);
}
-
static
inline unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
+inline unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
unsigned int *io_u_plat_last)
{
unsigned long sum;
int k;
unsigned int *io_u_plat_last)
{
unsigned long sum;
int k;
- for (k = sum = 0; k < stride; k++)
- sum += io_u_plat[j + k] - io_u_plat_last[j + k];
+ if (io_u_plat_last) {
+ for (k = sum = 0; k < stride; k++)
+ sum += io_u_plat[j + k] - io_u_plat_last[j + k];
+ } else {
+ for (k = sum = 0; k < stride; k++)
+ sum += io_u_plat[j + k];
+ }
return sum;
}
return sum;
}
-void flush_hist_samples(FILE *f, int hist_coarseness, void *samples,
- uint64_t sample_size)
+
static
void flush_hist_samples(FILE *f, int hist_coarseness, void *samples,
+
uint64_t sample_size)
{
struct io_sample *s;
int log_offset;
{
struct io_sample *s;
int log_offset;
@@
-708,22
+719,23
@@
void flush_hist_samples(FILE *f, int hist_coarseness, void *samples,
for (i = 0; i < nr_samples; i++) {
s = __get_sample(samples, log_offset, i);
for (i = 0; i < nr_samples; i++) {
s = __get_sample(samples, log_offset, i);
-
- entry = (struct io_u_plat_entry *) s->val;
+
+ entry = (struct io_u_plat_entry *)
(uintptr_t)
s->val;
io_u_plat = entry->io_u_plat;
io_u_plat = entry->io_u_plat;
-
+
entry_before = flist_first_entry(&entry->list, struct io_u_plat_entry, list);
io_u_plat_before = entry_before->io_u_plat;
entry_before = flist_first_entry(&entry->list, struct io_u_plat_entry, list);
io_u_plat_before = entry_before->io_u_plat;
-
- fprintf(f, "%lu, %u, %u, ", (unsigned long)s->time,
- io_sample_ddir(s), s->bs);
+
+ fprintf(f, "%lu, %u, %u, ", (unsigned long)
s->time,
+
io_sample_ddir(s), s->bs);
for (j = 0; j < FIO_IO_U_PLAT_NR - stride; j += stride) {
for (j = 0; j < FIO_IO_U_PLAT_NR - stride; j += stride) {
- fprintf(f, "%lu, ", hist_sum(j, stride, io_u_plat, io_u_plat_before));
+ fprintf(f, "%lu, ", hist_sum(j, stride, io_u_plat,
+ io_u_plat_before));
}
}
- fprintf(f, "%lu\n", (unsigned long)
+ fprintf(f, "%lu\n", (unsigned long)
hist_sum(FIO_IO_U_PLAT_NR - stride, stride, io_u_plat,
hist_sum(FIO_IO_U_PLAT_NR - stride, stride, io_u_plat,
- io_u_plat_before));
-
+
io_u_plat_before));
+
flist_del(&entry_before->list);
free(entry_before);
}
flist_del(&entry_before->list);
free(entry_before);
}
@@
-1059,11
+1071,11
@@
void flush_log(struct io_log *log, bool do_append)
cur_log = flist_first_entry(&log->io_logs, struct io_logs, list);
flist_del_init(&cur_log->list);
cur_log = flist_first_entry(&log->io_logs, struct io_logs, list);
flist_del_init(&cur_log->list);
- if (log == log->td->clat_hist_log)
+ if (log
->td && log
== log->td->clat_hist_log)
flush_hist_samples(f, log->hist_coarseness, cur_log->log,
flush_hist_samples(f, log->hist_coarseness, cur_log->log,
-
cur_log->nr_samples * log_entry_sz(
log));
+
log_sample_sz(log, cur_
log));
else
else
- flush_samples(f, cur_log->log,
cur_log->nr_samples * log_entry_sz(
log));
+ flush_samples(f, cur_log->log,
log_sample_sz(log, cur_
log));
sfree(cur_log);
}
sfree(cur_log);
}
@@
-1147,7
+1159,8
@@
static int gz_work(struct iolog_flush_data *data)
data->log->filename);
do {
if (c)
data->log->filename);
do {
if (c)
- dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq, c->len);
+ dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq,
+ (unsigned long) c->len);
c = get_new_chunk(seq);
stream.avail_out = GZ_CHUNK;
stream.next_out = c->buf;
c = get_new_chunk(seq);
stream.avail_out = GZ_CHUNK;
stream.next_out = c->buf;
@@
-1184,7
+1197,7
@@
static int gz_work(struct iolog_flush_data *data)
total -= c->len;
c->len = GZ_CHUNK - stream.avail_out;
total += c->len;
total -= c->len;
c->len = GZ_CHUNK - stream.avail_out;
total += c->len;
- dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq, c->len);
+ dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq,
(unsigned long)
c->len);
if (ret != Z_STREAM_END) {
do {
if (ret != Z_STREAM_END) {
do {
@@
-1195,7
+1208,8
@@
static int gz_work(struct iolog_flush_data *data)
c->len = GZ_CHUNK - stream.avail_out;
total += c->len;
flist_add_tail(&c->list, &list);
c->len = GZ_CHUNK - stream.avail_out;
total += c->len;
flist_add_tail(&c->list, &list);
- dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq, c->len);
+ dprint(FD_COMPRESS, "seq=%d, chunk=%lu\n", seq,
+ (unsigned long) c->len);
} while (ret != Z_STREAM_END);
}
} while (ret != Z_STREAM_END);
}