X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=6117b702c49e4fa345dad601362f65085362ee32;hp=c44d8221ee936c4c0d235c87efa0f7607eca8dc7;hb=0b80f9c02533d920b03bd9a7203f512b55757690;hpb=5f9099ea8adf423d0db01274ef0d7e65629c0e1c

diff --git a/log.c b/log.c
index c44d8221..6117b702 100644
--- a/log.c
+++ b/log.c
@@ -20,9 +20,10 @@ void queue_io_piece(struct thread_data *td, struct io_piece *ipo)
 
 void log_io_u(struct thread_data *td, struct io_u *io_u)
 {
-	const char *act[] = { "read", "write", "sync", "datasync" };
+	const char *act[] = { "read", "write", "sync", "datasync",
+				"sync_file_range" };
 
-	assert(io_u->ddir < 3);
+	assert(io_u->ddir <= 4);
 
 	if (!td->o.write_iolog_file)
 		return;
@@ -86,10 +87,8 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo)
 	switch (ipo->file_action) {
 	case FIO_LOG_OPEN_FILE:
 		ret = td_io_open_file(td, f);
-		if (!ret) {
-			free(ipo);
+		if (!ret)
 			break;
-		}
 		td_verror(td, ret, "iolog open file");
 		return -1;
 	case FIO_LOG_CLOSE_FILE:
@@ -109,7 +108,8 @@ static int ipo_special(struct thread_data *td, struct io_piece *ipo)
 int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
-
+	unsigned long elapsed;
+	
 	while (!flist_empty(&td->io_log_list)) {
 		int ret;
 
@@ -125,20 +125,27 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 			continue;
 		}
 
-		io_u->offset = ipo->offset;
-		io_u->buflen = ipo->len;
 		io_u->ddir = ipo->ddir;
-		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);
+		if (ipo->ddir != DDIR_WAIT) {
+			io_u->offset = ipo->offset;
+			io_u->buflen = ipo->len;
+			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);
+		} else {
+			elapsed = mtime_since_genesis();
+			if (ipo->delay > elapsed)
+				usec_sleep(td, (ipo->delay - elapsed) * 1000);
+				
+		}
 
 		free(ipo);
-		return 0;
+		
+		if (io_u->ddir != DDIR_WAIT)
+			return 0;
 	}
 
 	td->done = 1;
@@ -153,12 +160,14 @@ void prune_io_piece_log(struct thread_data *td)
 	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);
+		td->io_hist_len--;
 		free(ipo);
 	}
 
 	while (!flist_empty(&td->io_hist_list)) {
 		ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
 		flist_del(&ipo->list);
+		td->io_hist_len--;
 		free(ipo);
 	}
 }
@@ -194,6 +203,7 @@ void log_io_piece(struct thread_data *td, struct io_u *io_u)
 	      (file_randommap(td, ipo->file) || td->o.verify == VERIFY_NONE)) {
 		INIT_FLIST_HEAD(&ipo->list);
 		flist_add_tail(&ipo->list, &td->io_hist_list);
+		td->io_hist_len++;
 		return;
 	}
 
@@ -209,19 +219,26 @@ restart:
 		parent = *p;
 
 		__ipo = rb_entry(parent, struct io_piece, rb_node);
-		if (ipo->offset < __ipo->offset)
+		if (ipo->file < __ipo->file)
+			p = &(*p)->rb_left;
+		else if (ipo->file > __ipo->file)
+			p = &(*p)->rb_right;
+		else if (ipo->offset < __ipo->offset)
 			p = &(*p)->rb_left;
 		else if (ipo->offset > __ipo->offset)
 			p = &(*p)->rb_right;
 		else {
 			assert(ipo->len == __ipo->len);
+			td->io_hist_len--;
 			rb_erase(parent, &td->io_hist_tree);
+			free(__ipo);
 			goto restart;
 		}
 	}
 
 	rb_link_node(&ipo->rb_node, parent, p);
 	rb_insert_color(&ipo->rb_node, &td->io_hist_tree);
+	td->io_hist_len++;
 }
 
 void write_iolog_close(struct thread_data *td)
@@ -241,7 +258,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 {
 	unsigned long long offset;
 	unsigned int bytes;
-	int reads, writes, fileno = 0, file_action = 0; /* stupid gcc */
+	int reads, writes, waits, fileno = 0, file_action = 0; /* stupid gcc */
 	char *fname, *act;
 	char *str, *p;
 	enum fio_ddir rw;
@@ -256,7 +273,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 	fname = malloc(256+16);
 	act = malloc(256+16);
 
-	reads = writes = 0;
+	reads = writes = waits = 0;
 	while ((p = fgets(str, 4096, f)) != NULL) {
 		struct io_piece *ipo;
 		int r;
@@ -267,7 +284,9 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			/*
 			 * Check action first
 			 */
-			if (!strcmp(act, "read"))
+			if (!strcmp(act, "wait"))
+				rw = DDIR_WAIT;
+			else if (!strcmp(act, "read"))
 				rw = DDIR_READ;
 			else if (!strcmp(act, "write"))
 				rw = DDIR_WRITE;
@@ -312,6 +331,9 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			if (read_only)
 				continue;
 			writes++;
+		} else if (rw == DDIR_WAIT) {
+			waits++;
+		} else if (rw == DDIR_INVAL) {
 		} else if (!ddir_sync(rw)) {
 			log_err("bad ddir: %d\n", rw);
 			continue;
@@ -323,15 +345,18 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 		ipo = malloc(sizeof(*ipo));
 		memset(ipo, 0, sizeof(*ipo));
 		INIT_FLIST_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;
-		if (rw == DDIR_INVAL) {
+		if (rw == DDIR_WAIT) {
+			ipo->delay = offset;
+		} else {
+			ipo->offset = offset;
+			ipo->len = bytes;
+			if (bytes > td->o.max_bs[rw])
+				td->o.max_bs[rw] = bytes;
 			ipo->fileno = fileno;
 			ipo->file_action = file_action;
 		}
+			
 		queue_io_piece(td, ipo);
 	}
 
@@ -345,7 +370,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 		writes = 0;
 	}
 
-	if (!reads && !writes)
+	if (!reads && !writes && !waits)
 		return 1;
 	else if (reads && !writes)
 		td->o.td_ddir = TD_DDIR_READ;