X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=99f20b53083b29ae4399827ff677b89e1d16781f;hp=6fe4961255c710a0ccc82a3e2c66478eb0f334d9;hb=44f29692cfba246981bb3c1b894333a6d2209f51;hpb=77787c82d755cc8ab8fda82531dd648cfd127d8d

diff --git a/log.c b/log.c
index 6fe49612..99f20b53 100644
--- a/log.c
+++ b/log.c
@@ -8,6 +8,7 @@
 #include <assert.h>
 #include "flist.h"
 #include "fio.h"
+#include "verify.h"
 
 static const char iolog_ver2[] = "fio version 2 iolog";
 
@@ -19,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" };
+	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;
@@ -85,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:
@@ -108,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;
 
@@ -124,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 (ipo->ddir != DDIR_WAIT)
+			return 0;
 	}
 
 	td->done = 1;
@@ -240,7 +248,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;
@@ -255,7 +263,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;
@@ -266,12 +274,16 @@ 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;
 			else if (!strcmp(act, "sync"))
 				rw = DDIR_SYNC;
+			else if (!strcmp(act, "datasync"))
+				rw = DDIR_DATASYNC;
 			else {
 				log_err("fio: bad iolog file action: %s\n",
 									act);
@@ -309,7 +321,10 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			if (read_only)
 				continue;
 			writes++;
-		} else if (rw != DDIR_SYNC && rw != DDIR_INVAL) {
+		} else if (rw == DDIR_WAIT) {
+			waits++;
+		} else if (rw == DDIR_INVAL) {
+		} else if (!ddir_sync(rw)) {
 			log_err("bad ddir: %d\n", rw);
 			continue;
 		}
@@ -320,15 +335,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);
 	}
 
@@ -342,7 +360,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;
@@ -406,8 +424,6 @@ static int init_iolog_write(struct thread_data *td)
 		return 1;
 	}
 
-	printf("log opened\n");
-
 	/*
 	 * That's it for writing, setup a log buffer and we're done.
 	  */
@@ -473,8 +489,10 @@ void __finish_log(struct io_log *log, const char *name)
 	}
 
 	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);
+		fprintf(f, "%lu, %lu, %u, %u\n", log->log[i].time,
+						log->log[i].val,
+						log->log[i].ddir,
+						log->log[i].bs);
 	}
 
 	fclose(f);