projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ETA output control and interactivity check
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 759771ae6a5d3167b7fcb36f92990164d3faf351..66b8f5babfe106ba3d7d1a68ab02d393d3467c22 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-233,9
+233,14
@@
static int read_iolog2(struct thread_data *td, FILE *f)
if (rw == DDIR_READ)
reads++;
if (rw == DDIR_READ)
reads++;
- else if (rw == DDIR_WRITE)
+ else if (rw == DDIR_WRITE)
{
writes++;
writes++;
- else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+ /*
+ * Don't add a write for ro mode
+ */
+ if (read_only)
+ continue;
+ } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
log_err("bad ddir: %d\n", rw);
continue;
}
log_err("bad ddir: %d\n", rw);
continue;
}
@@
-263,6
+268,11
@@
static int read_iolog2(struct thread_data *td, FILE *f)
free(act);
free(fname);
free(act);
free(fname);
+ if (writes && read_only) {
+ log_err("fio: <%s> skips replay of %d writes due to read-only\n", td->o.name, writes);
+ writes = 0;
+ }
+
if (!reads && !writes)
return 1;
else if (reads && !writes)
if (!reads && !writes)
return 1;
else if (reads && !writes)
@@
-301,9
+311,14
@@
static int read_iolog(struct thread_data *td, FILE *f)
}
if (rw == DDIR_READ)
reads++;
}
if (rw == DDIR_READ)
reads++;
- else if (rw == DDIR_WRITE)
+ else if (rw == DDIR_WRITE)
{
writes++;
writes++;
- else if (rw != DDIR_SYNC) {
+ /*
+ * Don't add a write for ro mode
+ */
+ if (read_only)
+ continue;
+ } else if (rw != DDIR_SYNC) {
log_err("bad ddir: %d\n", rw);
continue;
}
log_err("bad ddir: %d\n", rw);
continue;
}
@@
-322,6
+337,11
@@
static int read_iolog(struct thread_data *td, FILE *f)
free(str);
free(str);
+ if (writes && read_only) {
+ log_err("fio: <%s> skips replay of %d writes due to read-only\n", td->o.name, writes);
+ writes = 0;
+ }
+
if (!reads && !writes)
return 1;
else if (reads && !writes)
if (!reads && !writes)
return 1;
else if (reads && !writes)