X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=log.c;h=5ed30eb6f103efb8ed6150d04a807a9dc018ef63;hb=7dbb6eba84b38be2d3d10cd4d6cc145d939c5745;hp=0614b277c1e9de3752b977c284aa2531f9581049;hpb=bb5d7d0b5bde867690590aaa61d77307d773107f;p=fio.git

diff --git a/log.c b/log.c
index 0614b277..5ed30eb6 100644
--- a/log.c
+++ b/log.c
@@ -8,6 +8,24 @@ void write_iolog_put(struct thread_data *td, struct io_u *io_u)
 	fprintf(td->iolog_f, "%u,%llu,%lu\n", io_u->ddir, io_u->offset, io_u->buflen);
 }
 
+static void iolog_delay(struct thread_data *td, unsigned long delay)
+{
+	unsigned long usec = utime_since_now(&td->last_issue);
+
+	if (delay < usec)
+		return;
+
+	delay -= usec;
+
+	/*
+	 * less than 100 usec delay, just regard it as noise
+	 */
+	if (delay < 100)
+		return;
+
+	usec_sleep(td, delay);
+}
+
 int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
@@ -19,6 +37,15 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 		io_u->buflen = ipo->len;
 		io_u->ddir = ipo->ddir;
 		io_u->file = ipo->file;
+
+		if (ipo->delay)
+			iolog_delay(td, ipo->delay);
+
+		/*
+		 * work around, this needs a format change to work for > 1 file
+		 */
+		if (!io_u->file)
+			io_u->file = &td->files[0];
 		free(ipo);
 		return 0;
 	}
@@ -43,16 +70,34 @@ void prune_io_piece_log(struct thread_data *td)
  */
 void log_io_piece(struct thread_data *td, struct io_u *io_u)
 {
-	struct rb_node **p = &td->io_hist_tree.rb_node;
-	struct rb_node *parent = NULL;
+	struct rb_node **p, *parent;
 	struct io_piece *ipo, *__ipo;
 
 	ipo = malloc(sizeof(struct io_piece));
-	RB_CLEAR_NODE(&ipo->rb_node);
 	ipo->file = io_u->file;
 	ipo->offset = io_u->offset;
 	ipo->len = io_u->buflen;
 
+	/*
+	 * We don't need to sort the entries, if:
+	 *
+	 *	Sequential writes, or
+	 *	Random writes that lay out the file as it goes along
+	 *
+	 * For both these cases, just reading back data in the order we
+	 * wrote it out is the fastest.
+	 */
+	if (!td_random(td) || !td->o.overwrite ||
+	     (io_u->file->flags & FIO_FILE_NOSORT)) {
+		INIT_LIST_HEAD(&ipo->list);
+		list_add_tail(&ipo->list, &td->io_hist_list);
+		return;
+	}
+
+	RB_CLEAR_NODE(&ipo->rb_node);
+	p = &td->io_hist_tree.rb_node;
+	parent = NULL;
+
 	/*
 	 * Sort the entry into the verification list
 	 */
@@ -117,6 +162,7 @@ static int init_iolog_read(struct thread_data *td)
 		}
 
 		ipo = malloc(sizeof(*ipo));
+		memset(ipo, 0, sizeof(*ipo));
 		INIT_LIST_HEAD(&ipo->list);
 		ipo->offset = offset;
 		ipo->len = bytes;
@@ -134,7 +180,7 @@ static int init_iolog_read(struct thread_data *td)
 	else if (reads && !writes)
 		td->o.td_ddir = TD_DDIR_READ;
 	else if (!reads && writes)
-		td->o.td_ddir = TD_DDIR_READ;
+		td->o.td_ddir = TD_DDIR_WRITE;
 	else
 		td->o.td_ddir = TD_DDIR_RW;
 
@@ -148,6 +194,11 @@ static int init_iolog_write(struct thread_data *td)
 {
 	FILE *f;
 
+	if (td->o.nr_files > 1) {
+		log_err("fio: write_iolog only works with 1 file currently\n");
+		return 1;
+	}
+
 	f = fopen(td->o.write_iolog_file, "w+");
 	if (!f) {
 		perror("fopen write iolog");
@@ -170,9 +221,16 @@ int init_iolog(struct thread_data *td)
 	if (td->io_ops->flags & FIO_DISKLESSIO)
 		return 0;
 
-	if (td->o.read_iolog_file)
-		ret = init_iolog_read(td);
-	else if (td->o.write_iolog_file)
+	if (td->o.read_iolog_file) {
+		/*
+		 * Check if it's a blktrace file and load that if possible.
+		 * Otherwise assume it's a normal log file and load that.
+		 */
+		if (is_blktrace(td->o.read_iolog_file))
+			ret = load_blktrace(td, td->o.read_iolog_file);
+		else
+			ret = init_iolog_read(td);
+	} else if (td->o.write_iolog_file)
 		ret = init_iolog_write(td);
 
 	return ret;