projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: ensure that dev loop doesn't truncate name
[fio.git]
/
iolog.c
diff --git
a/iolog.c
b/iolog.c
index 0c3382d37371ee60ebaba0709ce053c7b64243e5..01b82e8dc16b47cab2feef017d7bd60e6b7d49ef 100644
(file)
--- a/
iolog.c
+++ b/
iolog.c
@@
-19,6
+19,7
@@
#include "trim.h"
#include "filelock.h"
#include "smalloc.h"
#include "trim.h"
#include "filelock.h"
#include "smalloc.h"
+#include "blktrace.h"
static int iolog_flush(struct io_log *log);
static int iolog_flush(struct io_log *log);
@@
-277,7
+278,7
@@
restart:
overlap = 1;
if (overlap) {
overlap = 1;
if (overlap) {
- dprint(FD_IO, "iolog: overlap %llu/%lu, %llu/%lu",
+ dprint(FD_IO, "iolog: overlap %llu/%lu, %llu/%lu
\n
",
__ipo->offset, __ipo->len,
ipo->offset, ipo->len);
td->io_hist_len--;
__ipo->offset, __ipo->len,
ipo->offset, ipo->len);
td->io_hist_len--;
@@
-422,7
+423,7
@@
static int read_iolog2(struct thread_data *td, FILE *f)
continue;
}
} else {
continue;
}
} else {
- log_err("bad iolog2: %s", p);
+ log_err("bad iolog2: %s
\n
", p);
continue;
}
continue;
}
@@
-454,7
+455,12
@@
static int read_iolog2(struct thread_data *td, FILE *f)
if (rw == DDIR_WAIT) {
ipo->delay = offset;
} else {
if (rw == DDIR_WAIT) {
ipo->delay = offset;
} else {
- ipo->offset = offset;
+ if (td->o.replay_scale)
+ ipo->offset = offset / td->o.replay_scale;
+ else
+ ipo->offset = offset;
+ ipo_bytes_align(td->o.replay_align, ipo);
+
ipo->len = bytes;
if (rw != DDIR_INVAL && bytes > td->o.max_bs[rw])
td->o.max_bs[rw] = bytes;
ipo->len = bytes;
if (rw != DDIR_INVAL && bytes > td->o.max_bs[rw])
td->o.max_bs[rw] = bytes;
@@
-691,7
+697,7
@@
void free_log(struct io_log *log)
sfree(log);
}
sfree(log);
}
-
inline
unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
+unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
unsigned int *io_u_plat_last)
{
unsigned long sum;
unsigned int *io_u_plat_last)
{
unsigned long sum;