X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=5ed30eb6f103efb8ed6150d04a807a9dc018ef63;hp=17a4cdf782c9b02c7c897454abcae6bf66dec34e;hb=2135abc4f63c54e213abe0e9469eeba7a58815fc;hpb=56f9498d8588d42df2a41a7eb7ebcffef013a339

diff --git a/log.c b/log.c
index 17a4cdf7..5ed30eb6 100644
--- a/log.c
+++ b/log.c
@@ -5,7 +5,25 @@
 
 void write_iolog_put(struct thread_data *td, struct io_u *io_u)
 {
-	fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+	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)
@@ -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;
 	}
@@ -29,50 +56,63 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 void prune_io_piece_log(struct thread_data *td)
 {
 	struct io_piece *ipo;
+	struct rb_node *n;
 
-	while (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
-
-		list_del(&ipo->list);
+	while ((n = rb_first(&td->io_hist_tree)) != NULL) {
+		ipo = rb_entry(n, struct io_piece, rb_node);
+		rb_erase(n, &td->io_hist_tree);
 		free(ipo);
 	}
 }
 
 /*
- * log a succesful write, so we can unwind the log for verify
+ * log a successful write, so we can unwind the log for verify
  */
 void log_io_piece(struct thread_data *td, struct io_u *io_u)
 {
-	struct io_piece *ipo = malloc(sizeof(struct io_piece));
-	struct list_head *entry;
+	struct rb_node **p, *parent;
+	struct io_piece *ipo, *__ipo;
 
-	INIT_LIST_HEAD(&ipo->list);
+	ipo = malloc(sizeof(struct io_piece));
 	ipo->file = io_u->file;
 	ipo->offset = io_u->offset;
 	ipo->len = io_u->buflen;
 
 	/*
-	 * for random io where the writes extend the file, it will typically
-	 * be laid out with the block scattered as written. it's faster to
-	 * read them in in that order again, so don't sort
+	 * 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->sequential || !td->overwrite) {
+	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;
+
 	/*
-	 * for random io, sort the list so verify will run faster
+	 * Sort the entry into the verification list
 	 */
-	entry = &td->io_hist_list;
-	while ((entry = entry->prev) != &td->io_hist_list) {
-		struct io_piece *__ipo = list_entry(entry, struct io_piece, list);
-
-		if (__ipo->offset < ipo->offset)
-			break;
+	while (*p) {
+		parent = *p;
+
+		__ipo = rb_entry(parent, struct io_piece, rb_node);
+		if (ipo->offset <= __ipo->offset)
+			p = &(*p)->rb_left;
+		else
+			p = &(*p)->rb_right;
 	}
 
-	list_add(&ipo->list, entry);
+	rb_link_node(&ipo->rb_node, parent, p);
+	rb_insert_color(&ipo->rb_node, &td->io_hist_tree);
 }
 
 void write_iolog_close(struct thread_data *td)
@@ -93,7 +133,7 @@ static int init_iolog_read(struct thread_data *td)
 	FILE *f;
 	int rw, reads, writes;
 
-	f = fopen(td->iolog_file, "r");
+	f = fopen(td->o.read_iolog_file, "r");
 	if (!f) {
 		perror("fopen read iolog");
 		return 1;
@@ -116,18 +156,19 @@ static int init_iolog_read(struct thread_data *td)
 			reads++;
 		else if (rw == DDIR_WRITE)
 			writes++;
-		else {
+		else if (rw != DDIR_SYNC) {
 			log_err("bad ddir: %d\n", rw);
 			continue;
 		}
 
 		ipo = malloc(sizeof(*ipo));
+		memset(ipo, 0, sizeof(*ipo));
 		INIT_LIST_HEAD(&ipo->list);
 		ipo->offset = offset;
 		ipo->len = bytes;
-		if (bytes > td->max_bs)
-			td->max_bs = bytes;
-		ipo->ddir = rw;
+		ipo->ddir = (enum fio_ddir) rw;
+		if (bytes > td->o.max_bs[rw])
+			td->o.max_bs[rw] = bytes;
 		list_add_tail(&ipo->list, &td->io_log_list);
 	}
 
@@ -137,11 +178,11 @@ static int init_iolog_read(struct thread_data *td)
 	if (!reads && !writes)
 		return 1;
 	else if (reads && !writes)
-		td->ddir = DDIR_READ;
+		td->o.td_ddir = TD_DDIR_READ;
 	else if (!reads && writes)
-		td->ddir = DDIR_READ;
+		td->o.td_ddir = TD_DDIR_WRITE;
 	else
-		td->iomix = 1;
+		td->o.td_ddir = TD_DDIR_RW;
 
 	return 0;
 }
@@ -151,9 +192,14 @@ static int init_iolog_read(struct thread_data *td)
  */
 static int init_iolog_write(struct thread_data *td)
 {
-	FILE *f = fopen(td->iolog_file, "w");
+	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->iolog_file, "w");
+	f = fopen(td->o.write_iolog_file, "w+");
 	if (!f) {
 		perror("fopen write iolog");
 		return 1;
@@ -172,30 +218,22 @@ int init_iolog(struct thread_data *td)
 {
 	int ret = 0;
 
-	if (td->read_iolog)
-		ret = init_iolog_read(td);
-	else if (td->write_iolog)
-		ret = init_iolog_write(td);
-
-	return 0;
-}
-
-int setup_rate(struct thread_data *td)
-{
-	int nr_reads_per_sec;
-
-	if (!td->rate)
+	if (td->io_ops->flags & FIO_DISKLESSIO)
 		return 0;
 
-	if (td->rate < td->ratemin) {
-		log_err("min rate larger than nominal rate\n");
-		return -1;
-	}
+	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);
 
-	nr_reads_per_sec = (td->rate * 1024) / td->min_bs;
-	td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
-	td->rate_pending_usleep = 0;
-	return 0;
+	return ret;
 }
 
 void setup_log(struct io_log **log)
@@ -208,14 +246,12 @@ void setup_log(struct io_log **log)
 	*log = l;
 }
 
-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+void __finish_log(struct io_log *log, const char *name)
 {
-	char file_name[256];
-	FILE *f;
 	unsigned int i;
+	FILE *f;
 
-	snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
-	f = fopen(file_name, "w");
+	f = fopen(name, "w");
 	if (!f) {
 		perror("fopen log");
 		return;
@@ -228,3 +264,11 @@ void finish_log(struct thread_data *td, struct io_log *log, const char *name)
 	free(log->log);
 	free(log);
 }
+
+void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+{
+	char file_name[256];
+
+	snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
+	__finish_log(log, file_name);
+}