#include <assert.h>
#include "flist.h"
#include "fio.h"
+#include "verify.h"
static const char iolog_ver2[] = "fio version 2 iolog";
void log_io_u(struct thread_data *td, struct io_u *io_u)
{
- const char *act[] = { "read", "write", "sync" };
+ const char *act[] = { "read", "write", "sync", "datasync",
+ "sync_file_range" };
- assert(io_u->ddir < 3);
+ assert(io_u->ddir <= 4);
if (!td->o.write_iolog_file)
return;
switch (ipo->file_action) {
case FIO_LOG_OPEN_FILE:
ret = td_io_open_file(td, f);
- if (!ret) {
- free(ipo);
+ if (!ret)
break;
- }
td_verror(td, ret, "iolog open file");
return -1;
case FIO_LOG_CLOSE_FILE:
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
{
struct io_piece *ipo;
-
+ unsigned long elapsed;
+
while (!flist_empty(&td->io_log_list)) {
int ret;
continue;
}
- io_u->offset = ipo->offset;
- io_u->buflen = ipo->len;
io_u->ddir = ipo->ddir;
- io_u->file = td->files[ipo->fileno];
- get_file(io_u->file);
-
- dprint(FD_IO, "iolog: get %llu/%lu/%s\n", io_u->offset,
- io_u->buflen, io_u->file->file_name);
-
- if (ipo->delay)
- iolog_delay(td, ipo->delay);
+ if (ipo->ddir != DDIR_WAIT) {
+ io_u->offset = ipo->offset;
+ io_u->buflen = ipo->len;
+ io_u->file = td->files[ipo->fileno];
+ get_file(io_u->file);
+
+ dprint(FD_IO, "iolog: get %llu/%lu/%s\n", io_u->offset,
+ io_u->buflen, io_u->file->file_name);
+ if (ipo->delay) iolog_delay(td, ipo->delay);
+ } else {
+ elapsed = mtime_since_genesis();
+ if (ipo->delay > elapsed)
+ usec_sleep(td, (ipo->delay - elapsed) * 1000);
+
+ }
free(ipo);
- return 0;
+
+ if (ipo->ddir != DDIR_WAIT)
+ return 0;
}
td->done = 1;
{
unsigned long long offset;
unsigned int bytes;
- int reads, writes, fileno = 0, file_action = 0; /* stupid gcc */
+ int reads, writes, waits, fileno = 0, file_action = 0; /* stupid gcc */
char *fname, *act;
char *str, *p;
enum fio_ddir rw;
fname = malloc(256+16);
act = malloc(256+16);
- reads = writes = 0;
+ reads = writes = waits = 0;
while ((p = fgets(str, 4096, f)) != NULL) {
struct io_piece *ipo;
int r;
/*
* Check action first
*/
- if (!strcmp(act, "read"))
+ if (!strcmp(act, "wait"))
+ rw = DDIR_WAIT;
+ else if (!strcmp(act, "read"))
rw = DDIR_READ;
else if (!strcmp(act, "write"))
rw = DDIR_WRITE;
else if (!strcmp(act, "sync"))
rw = DDIR_SYNC;
+ else if (!strcmp(act, "datasync"))
+ rw = DDIR_DATASYNC;
else {
log_err("fio: bad iolog file action: %s\n",
act);
if (read_only)
continue;
writes++;
- } else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+ } else if (rw == DDIR_WAIT) {
+ waits++;
+ } else if (rw == DDIR_INVAL) {
+ } else if (!ddir_sync(rw)) {
log_err("bad ddir: %d\n", rw);
continue;
}
ipo = malloc(sizeof(*ipo));
memset(ipo, 0, sizeof(*ipo));
INIT_FLIST_HEAD(&ipo->list);
- ipo->offset = offset;
- ipo->len = bytes;
ipo->ddir = rw;
- if (bytes > td->o.max_bs[rw])
- td->o.max_bs[rw] = bytes;
- if (rw == DDIR_INVAL) {
+ if (rw == DDIR_WAIT) {
+ ipo->delay = offset;
+ } else {
+ ipo->offset = offset;
+ ipo->len = bytes;
+ if (bytes > td->o.max_bs[rw])
+ td->o.max_bs[rw] = bytes;
ipo->fileno = fileno;
ipo->file_action = file_action;
}
+
queue_io_piece(td, ipo);
}
writes = 0;
}
- if (!reads && !writes)
+ if (!reads && !writes && !waits)
return 1;
else if (reads && !writes)
td->o.td_ddir = TD_DDIR_READ;
}
for (i = 0; i < log->nr_samples; i++) {
- fprintf(f, "%lu, %lu, %u\n", log->log[i].time, log->log[i].val,
- log->log[i].ddir);
+ fprintf(f, "%lu, %lu, %u, %u\n", log->log[i].time,
+ log->log[i].val,
+ log->log[i].ddir,
+ log->log[i].bs);
}
fclose(f);