Recent changes (master)
The following changes since commit a3e48f483db27d20e02cbd81e3a8f18c6c5c50f5:
Fio 3.30 (2022-04-06 17:10:00 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 6d01ac19170fadaf46a6db6b4cc347f1b389f422:
iolog: Use %llu for 64-bit (2022-04-08 12:46:44 -0600)
----------------------------------------------------------------
Jens Axboe (2):
iolog: fix warning for 32-bit compilation
iolog: Use %llu for 64-bit
Mohamad Gebai (3):
iolog: add version 3 to support timestamp-based replay
iolog: add iolog_write for version 3
iolog: update man page for version 3
HOWTO.rst | 29 +++++++++++++++- blktrace.c | 17 ++-------- fio.1 | 35 +++++++++++++++++++- fio.h | 4 ++- iolog.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++------------- iolog.h | 8 ++--- 6 files changed, 158 insertions(+), 44 deletions(-)
---
Diff of recent changes:
HOWTO.rst +28 -1
@@ -4398,7 +4398,9 @@ given in bytes. The `action` can be one of these: **wait** Wait for `offset` microseconds. Everything below 100 is discarded. - The time is relative to the previous `wait` statement. + The time is relative to the previous `wait` statement. Note that + action `wait` is not allowed as of version 3, as the same behavior + can be achieved using timestamps. **read** Read `length` bytes beginning from `offset`. **write**
@@ -4411,6 +4413,31 @@ given in bytes. The `action` can be one of these: Trim the given file from the given `offset` for `length` bytes. +Trace file format v3 +~~~~~~~~~~~~~~~~~~~~ + +The third version of the trace file format was added in fio version 3.31. It +forces each action to have a timestamp associated with it. + +The first line of the trace file has to be:: + + fio version 3 iolog + +Following this can be lines in two different formats, which are described below. + +The file management format:: + + timestamp filename action + +The file I/O action format:: + + timestamp filename action offset length + +The `timestamp` is relative to the beginning of the run (ie starts at 0). The +`filename`, `action`, `offset` and `length` are identical to version 2, except +that version 3 does not allow the `wait` action. + + I/O Replay - Merging Traces ---------------------------
blktrace.c +3 -14
@@ -313,25 +313,14 @@ static bool queue_trace(struct thread_data *td, struct blk_io_trace *t, unsigned long *ios, unsigned long long *bs, struct file_cache *cache) { - unsigned long long *last_ttime = &td->io_log_blktrace_last_ttime; + unsigned long long *last_ttime = &td->io_log_last_ttime;unsigned long long delay =0 ;if ((t->action &0xffff ) != __BLK_TA_QUEUE)return false;if (!(t->action &BLK_TC_ACT (BLK_TC_NOTIFY ))) { -if (!*last_ttime || td->o.no_stall || t->time < *last_ttime) - delay =0 ; -else if (td->o.replay_time_scale ==100 ) - delay = t->time - *last_ttime; -else { -double tmp = t->time - *last_ttime; -double scale; - - scale = (double )100.0 / (double ) td->o.replay_time_scale; - tmp *= scale; - delay = tmp; - } + delay =delay_since_ttime (td, t->time); *last_ttime = t->time; }
@@ -422,7 +411,7 @@ bool init_blktrace_read(struct thread_data *td, const char *filename, int need_s goto err; } td->io_log_blktrace_swap = need_swap; - td->io_log_blktrace_last_ttime =0 ; + td->io_log_last_ttime =0 ; td->o.size =0 ;free_release_files (td);
fio.1 +34 -1
@@ -4117,7 +4117,9 @@ given in bytes. The `action' can be one of these: .TP .B wait Wait for `offset' microseconds. Everything below 100 is discarded. -The time is relative to the previous `wait' statement. +The time is relative to the previous `wait' statement. Note that action `wait` +is not allowed as of version 3, as the same behavior can be achieved using +timestamps. .TP .B read Read `length' bytes beginning from `offset'.
@@ -4135,6 +4137,37 @@ Write `length' bytes beginning from `offset'. Trim the given file from the given `offset' for `length' bytes. .RE .RE +.RE +.TP +.B Trace file format v3 +The third version of the trace file format was added in fio version 3.31. It +forces each action to have a timestamp associated with it. +.RS +.P +The first line of the trace file has to be: +.RS +.P +"fio version 3 iolog" +.RE +.P +Following this can be lines in two different formats, which are described below. +.P +.B +The file management format: +.RS +timestamp filename action +.P +.RE +.B +The file I/O action format: +.RS +timestamp filename action offset length +.P +The `timestamp` is relative to the beginning of the run (ie starts at 0). The +`filename`, `action`, `offset` and `length` are identical to version 2, except +that version 3 does not allow the `wait` action. +.RE +.RE .SH I/O REPLAY \- MERGING TRACES Colocation is a common practice used to get the most out of a machine. Knowing which workloads play nicely with each other and which ones don't is
fio.h +3 -1
@@ -431,10 +431,12 @@ struct thread_data {FILE *io_log_rfile;unsigned int io_log_blktrace;unsigned int io_log_blktrace_swap; -unsigned long long io_log_blktrace_last_ttime; +unsigned long long io_log_last_ttime; +struct timespec io_log_start_time;unsigned int io_log_current;unsigned int io_log_checkmark;unsigned int io_log_highmark; +unsigned int io_log_version;struct timespec io_log_highmark_time;/*
iolog.c +86 -23
227 lines not on this page · raw message
iolog.h +4 -4
@@ -227,10 +227,8 @@ struct io_piece {unsigned long len;unsigned int flags;enum fio_ddir ddir; -union { -unsigned long delay; -unsigned int file_action; - }; +unsigned long delay; +unsigned int file_action; };/*
@@ -259,6 +257,8 @@ extern int iolog_compress_init(struct thread_data *, struct sk_out *);extern void iolog_compress_exit (struct thread_data *);extern size_t log_chunk_sizes (struct io_log *);extern int init_io_u_buffers (struct thread_data *); +extern unsigned long long delay_since_ttime (const struct thread_data *, +unsigned long long );#ifdef CONFIG_ZLIB extern int iolog_file_inflate (const char *);