X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=63c0a332d6bb6680998cbfd81a186d0ff6f24a3e;hp=7a3327e5d29c2909700ba3413ae1bd903ce1f197;hb=3baddf2450d811be658fb47ef883ee84478dc352;hpb=20e354ef1243541ea196619772b83a962d7cb4df

diff --git a/log.c b/log.c
index 7a3327e5..63c0a332 100644
--- a/log.c
+++ b/log.c
@@ -10,6 +10,12 @@
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
+void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
+{
+	list_add_tail(&ipo->list, &td->io_log_list);
+	td->total_io_size += ipo->len;
+}
+
 void log_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	const char *act[] = { "read", "write", "sync" };
@@ -19,7 +25,9 @@ void log_io_u(struct thread_data *td, struct io_u *io_u)
 	if (!td->o.write_iolog_file)
 		return;
 
-	fprintf(td->iolog_f, "%s %s %llu %lu\n", io_u->file->file_name, act[io_u->ddir], io_u->offset, io_u->buflen);
+	fprintf(td->iolog_f, "%s %s %llu %lu\n", io_u->file->file_name,
+						act[io_u->ddir], io_u->offset,
+						io_u->buflen);
 }
 
 void log_file(struct thread_data *td, struct fio_file *f,
@@ -53,37 +61,70 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
 	usec_sleep(td, delay);
 }
 
+static int ipo_special(struct thread_data *td, struct io_piece *ipo)
+{
+	struct fio_file *f;
+	int ret;
+
+	/*
+	 * Not a special ipo
+	 */
+	if (ipo->ddir != DDIR_INVAL)
+		return 0;
+
+	f = td->files[ipo->fileno];
+
+	switch (ipo->file_action) {
+	case FIO_LOG_OPEN_FILE:
+		ret = td_io_open_file(td, f);
+		if (!ret) {
+			free(ipo);
+			break;
+		}
+		td_verror(td, ret, "iolog open file");
+		return -1;
+	case FIO_LOG_CLOSE_FILE:
+		td_io_close_file(td, f);
+		break;
+	case FIO_LOG_UNLINK_FILE:
+		unlink(f->file_name);
+		break;
+	default:
+		log_err("fio: bad file action %d\n", ipo->file_action);
+		break;
+	}
+
+	return 1;
+}
+
 int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
 
 	while (!list_empty(&td->io_log_list)) {
+		int ret;
+
 		ipo = list_entry(td->io_log_list.next, struct io_piece, list);
 		list_del(&ipo->list);
 
-		/*
-		 * invalid ddir, this is a file action
-		 */
-		if (ipo->ddir == DDIR_INVAL) {
-			struct fio_file *f = &td->files[ipo->fileno];
-
-			if (ipo->file_action == FIO_LOG_OPEN_FILE) {
-				assert(!td_io_open_file(td, f));
-				free(ipo);
-				continue;
-			} else if (ipo->file_action == FIO_LOG_CLOSE_FILE) {
-				td_io_close_file(td, f);
-				free(ipo);
-				continue;
-			}
+		ret = ipo_special(td, ipo);
+		if (ret < 0) {
+			free(ipo);
+			break;
+		} else if (ret > 0) {
+			free(ipo);
+			continue;
 		}
 
 		io_u->offset = ipo->offset;
 		io_u->buflen = ipo->len;
 		io_u->ddir = ipo->ddir;
-		io_u->file = &td->files[ipo->fileno];
+		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);
 
@@ -105,6 +146,12 @@ void prune_io_piece_log(struct thread_data *td)
 		rb_erase(n, &td->io_hist_tree);
 		free(ipo);
 	}
+
+	while (!list_empty(&td->io_hist_list)) {
+		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+		list_del(&ipo->list);
+		free(ipo);
+	}
 }
 
 /*
@@ -129,8 +176,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
 	 * 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)) {
+	if (!td_random(td) || !td->o.overwrite) {
 		INIT_LIST_HEAD(&ipo->list);
 		list_add_tail(&ipo->list, &td->io_hist_list);
 		return;
@@ -194,7 +240,8 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 		struct io_piece *ipo;
 		int r;
 
-		r = sscanf(p, "%256s %256s %llu %u", fname, act, &offset, &bytes);
+		r = sscanf(p, "%256s %256s %llu %u", fname, act, &offset,
+									&bytes);
 		if (r == 4) {
 			/*
 			 * Check action first
@@ -206,7 +253,8 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			else if (!strcmp(act, "sync"))
 				rw = DDIR_SYNC;
 			else {
-				log_err("fio: bad iolog file action: %s\n",act);
+				log_err("fio: bad iolog file action: %s\n",
+									act);
 				continue;
 			}
 		} else if (r == 2) {
@@ -223,19 +271,25 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 				fileno = get_fileno(td, fname);
 				file_action = FIO_LOG_CLOSE_FILE;
 			} else {
-				log_err("fio: bad iolog file action: %s\n",act);
+				log_err("fio: bad iolog file action: %s\n",
+									act);
 				continue;
 			}
 		} else {
 			log_err("bad iolog2: %s", p);
 			continue;
 		}
-			
+
 		if (rw == DDIR_READ)
 			reads++;
-		else if (rw == DDIR_WRITE)
+		else if (rw == DDIR_WRITE) {
+			/*
+			 * Don't add a write for ro mode
+			 */
+			if (read_only)
+				continue;
 			writes++;
-		else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+		} else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
 			log_err("bad ddir: %d\n", rw);
 			continue;
 		}
@@ -255,13 +309,19 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			ipo->fileno = fileno;
 			ipo->file_action = file_action;
 		}
-		list_add_tail(&ipo->list, &td->io_log_list);
+		queue_io_piece(td, ipo);
 	}
 
 	free(str);
 	free(act);
 	free(fname);
 
+	if (writes && read_only) {
+		log_err("fio: <%s> skips replay of %d writes due to"
+			" read-only\n", td->o.name, writes);
+		writes = 0;
+	}
+
 	if (!reads && !writes)
 		return 1;
 	else if (reads && !writes)
@@ -279,57 +339,8 @@ static int read_iolog2(struct thread_data *td, FILE *f)
  */
 static int read_iolog(struct thread_data *td, FILE *f)
 {
-	unsigned long long offset;
-	unsigned int bytes;
-	char *str, *p;
-	int reads, writes;
-	enum fio_ddir rw;
-
-	/*
-	 * Read in the read iolog and store it, reuse the infrastructure
-	 * for doing verifications.
-	 */
-	str = malloc(4096);
-	reads = writes = 0;
-	while ((p = fgets(str, 4096, f)) != NULL) {
-		struct io_piece *ipo;
-
-		if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
-			log_err("bad iolog: %s\n", p);
-			continue;
-		}
-		if (rw == DDIR_READ)
-			reads++;
-		else if (rw == DDIR_WRITE)
-			writes++;
-		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;
-		ipo->ddir = rw;
-		if (bytes > td->o.max_bs[rw])
-			td->o.max_bs[rw] = bytes;
-		list_add_tail(&ipo->list, &td->io_log_list);
-	}
-
-	free(str);
-
-	if (!reads && !writes)
-		return 1;
-	else if (reads && !writes)
-		td->o.td_ddir = TD_DDIR_READ;
-	else if (!reads && writes)
-		td->o.td_ddir = TD_DDIR_WRITE;
-	else
-		td->o.td_ddir = TD_DDIR_RW;
-
-	return 0;
+	log_err("fio: iolog version 1 is no longer supported\n");
+	return 1;
 }
 
 /*
@@ -459,8 +470,10 @@ void __finish_log(struct io_log *log, const char *name)
 		return;
 	}
 
-	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);
+	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);
+	}
 
 	fclose(f);
 	free(log->log);