X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=76e71b9ee4ef1e6cf3c2c23ebc8d036c8d98b04e;hp=b9c6d71400ec672b0288e0abe17f6cff345f9941;hb=4d8947de2b50578a4f6290be567cb5de5bf46776;hpb=b284075ab5414220496f396dff038003e57e3047

diff --git a/ioengines.c b/ioengines.c
index b9c6d714..76e71b9e 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -192,6 +192,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	if (td->io_ops->flags & FIO_SYNCIO) {
 		fio_gettime(&io_u->issue_time, NULL);
+		memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
 		/*
 		 * for a sync engine, set the timeout upfront
@@ -207,9 +208,6 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	ret = td->io_ops->queue(td, io_u);
 
-	if (ret == FIO_Q_QUEUED || ret == FIO_Q_COMPLETED)
-		get_file(io_u->file);
-
 	if (ret == FIO_Q_QUEUED) {
 		int r;
 
@@ -223,6 +221,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
 	if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
 		fio_gettime(&io_u->issue_time, NULL);
+		memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
 		/*
 		 * async engine, set the timeout here
@@ -271,6 +270,13 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 		return 1;
 	}
 
+	if (f->filetype == FIO_TYPE_PIPE) {
+		if (td_random(td)) {
+			log_err("fio: can't seek on pipes (no random io)\n");
+			goto err;
+		}
+	}
+
 	f->last_free_lookup = 0;
 	f->last_completed_pos = 0;
 	f->last_pos = 0;
@@ -283,7 +289,9 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
 		goto err;
 
-	if (td->o.fadvise_hint) {
+	if (td->o.fadvise_hint &&
+	    (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
+		
 		int flags;
 
 		if (td_random(td))
@@ -301,6 +309,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 		memset(f->file_map, 0, f->num_maps * sizeof(long));
 
 done:
+	log_file(td, f, FIO_LOG_OPEN_FILE);
 	td->nr_open_files++;
 	get_file(f);
 	return 0;
@@ -312,6 +321,9 @@ err:
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
+	if (!(f->flags & FIO_FILE_CLOSING))
+		log_file(td, f, FIO_LOG_CLOSE_FILE);
+
 	/*
 	 * mark as closing, do real close when last io on it has completed
 	 */