Skip to content

Fix I/O replay timing #1540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix I/O replay timing #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions engines/io_uring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,12 +613,6 @@ static void fio_ioring_queued(struct thread_data *td, int start, int nr)

start++;
}

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &now, sizeof(now));
}

static int fio_ioring_commit(struct thread_data *td)
Expand Down
6 changes: 0 additions & 6 deletions engines/libaio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,6 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
memcpy(&io_u->issue_time, &now, sizeof(now));
io_u_queued(td, io_u);
}

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &now, sizeof(now));
}

static int fio_libaio_commit(struct thread_data *td)
Expand Down
10 changes: 0 additions & 10 deletions engines/librpma_fio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,16 +597,6 @@ int librpma_fio_client_commit(struct thread_data *td)
}
}

if ((fill_time = fio_fill_issue_time(td))) {
fio_gettime(&now, NULL);

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &now, sizeof(now));

}
/* move executed io_us from queued[] to flight[] */
for (i = 0; i < ccd->io_u_queued_nr; i++) {
struct io_u *io_u = ccd->io_us_queued[i];
Expand Down
6 changes: 0 additions & 6 deletions engines/rdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,12 +832,6 @@ static void fio_rdmaio_queued(struct thread_data *td, struct io_u **io_us,
memcpy(&io_u->issue_time, &now, sizeof(now));
io_u_queued(td, io_u);
}

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &now, sizeof(now));
}

static int fio_rdmaio_commit(struct thread_data *td)
Expand Down
7 changes: 0 additions & 7 deletions init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,13 +628,6 @@ static int fixup_options(struct thread_data *td)
}
#endif

if (o->write_iolog_file && o->read_iolog_file) {
log_err("fio: read iolog overrides write_iolog\n");
free(o->write_iolog_file);
o->write_iolog_file = NULL;
ret |= warnings_fatal;
}

if (o->zone_mode == ZONE_MODE_NONE && o->zone_size) {
log_err("fio: --zonemode=none and --zonesize are not compatible.\n");
ret |= 1;
Expand Down
20 changes: 2 additions & 18 deletions ioengines.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,16 +358,8 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)

if (td_ioengine_flagged(td, FIO_SYNCIO) ||
async_ioengine_sync_trim(td, io_u)) {
if (fio_fill_issue_time(td)) {
if (fio_fill_issue_time(td))
fio_gettime(&io_u->issue_time, NULL);

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &io_u->issue_time,
sizeof(io_u->issue_time));
}
}


Expand Down Expand Up @@ -444,16 +436,8 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
if (!td_ioengine_flagged(td, FIO_SYNCIO) &&
!async_ioengine_sync_trim(td, io_u)) {
if (fio_fill_issue_time(td) &&
!td_ioengine_flagged(td, FIO_ASYNCIO_SETS_ISSUE_TIME)) {
!td_ioengine_flagged(td, FIO_ASYNCIO_SETS_ISSUE_TIME))
fio_gettime(&io_u->issue_time, NULL);

/*
* only used for iolog
*/
if (td->o.read_iolog_file)
memcpy(&td->last_issue, &io_u->issue_time,
sizeof(io_u->issue_time));
}
}

return ret;
Expand Down
28 changes: 15 additions & 13 deletions iolog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,23 @@ void log_file(struct thread_data *td, struct fio_file *f,

static void iolog_delay(struct thread_data *td, unsigned long delay)
{
uint64_t usec = utime_since_now(&td->last_issue);
unsigned long orig_delay = delay;
uint64_t usec;
unsigned long delay_wanted;
uint64_t this_delay;
struct timespec ts;
struct timespec ts, ts_after_sleep;

if (delay < td->time_offset) {
td->time_offset = 0;
return;
}
fio_gettime(&ts, NULL);
usec = utime_since(&td->last_issue, &ts) + td->time_offset;

delay -= td->time_offset;
if (delay < usec)
if (delay <= usec) {
td->time_offset = usec-delay;
td->last_issue = ts;
return;
}

delay -= usec;

fio_gettime(&ts, NULL);
delay_wanted = delay;
while (delay && !td->terminate) {
this_delay = delay;
if (this_delay > 500000)
Expand All @@ -106,11 +106,13 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
delay -= this_delay;
}

usec = utime_since_now(&ts);
if (usec > orig_delay)
td->time_offset = usec - orig_delay;
fio_gettime(&ts_after_sleep, NULL);
usec = utime_since(&ts, &ts_after_sleep);
if (usec > delay_wanted)
td->time_offset = usec - delay_wanted;
else
td->time_offset = 0;
td->last_issue = ts_after_sleep;
}

static int ipo_special(struct thread_data *td, struct io_piece *ipo)
Expand Down