X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=blktrace.c;h=4469243efdb502f97314b81e61f614ab3f854aaf;hp=111619c6c47301bbf1208895c6315ed3497c22f8;hb=87c27b45f8d50720d7a9f12abc7e83d0a7463021;hpb=cd991b9e36b18903f1564a4bfafdc83a9f165219

diff --git a/blktrace.c b/blktrace.c
index 111619c6..4469243e 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#include "list.h"
+#include "flist.h"
 #include "fio.h"
 #include "blktrace_api.h"
 
@@ -148,6 +148,18 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
 #define FMAJOR(dev)	((unsigned int) ((dev) >> FMINORBITS))
 #define FMINOR(dev)	((unsigned int) ((dev) & FMINORMASK))
 
+static void trace_add_open_event(struct thread_data *td, int fileno)
+{
+	struct io_piece *ipo;
+
+	ipo = calloc(1, sizeof(*ipo));
+
+	ipo->ddir = DDIR_INVAL;
+	ipo->fileno = fileno;
+	ipo->file_action = FIO_LOG_OPEN_FILE;
+	flist_add_tail(&ipo->list, &td->io_log_list);
+}
+
 static void trace_add_file(struct thread_data *td, __u32 device)
 {
 	static unsigned int last_maj, last_min;
@@ -172,8 +184,11 @@ static void trace_add_file(struct thread_data *td, __u32 device)
 
 	strcpy(dev, "/dev");
 	if (lookup_device(dev, maj, min)) {
+		int fileno;
+
 		dprint(FD_BLKTRACE, "add devices %s\n", dev);
-		add_file(td, dev);
+		fileno = add_file(td, dev);
+		trace_add_open_event(td, fileno);
 	}
 }
 
@@ -186,7 +201,7 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
 	struct io_piece *ipo = malloc(sizeof(*ipo));
 
 	memset(ipo, 0, sizeof(*ipo));
-	INIT_LIST_HEAD(&ipo->list);
+	INIT_FLIST_HEAD(&ipo->list);
 	/*
 	 * the 512 is wrong here, it should be the hardware sector size...
 	 */
@@ -201,12 +216,22 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
 	dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n",
 							ipo->ddir, ipo->offset,
 							ipo->len, ipo->delay);
-	list_add_tail(&ipo->list, &td->io_log_list);
+	queue_io_piece(td, ipo);
 }
 
-static void handle_trace_notify(struct thread_data *td, struct blk_io_trace *t)
+static void handle_trace_notify( struct blk_io_trace *t)
 {
-	printf("got notify: %x, %d\n", t->action, t->pid);
+	switch (t->action) {
+	case BLK_TN_PROCESS:
+		printf("got process notify: %x, %d\n", t->action, t->pid);
+		break;
+	case BLK_TN_TIMESTAMP:
+		printf("got timestamp notify: %x, %d\n", t->action, t->pid);
+		break;
+	default:
+		dprint(FD_BLKTRACE, "unknown trace act %x\n", t->action);
+		break;
+	}
 }
 
 static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
@@ -241,7 +266,7 @@ static void handle_trace(struct thread_data *td, struct blk_io_trace *t,
 		return;
 
 	if (t->action & BLK_TC_ACT(BLK_TC_NOTIFY))
-		handle_trace_notify(td, t);
+		handle_trace_notify(t);
 	else
 		handle_trace_fs(td, t, ttime, ios, bs);
 }
@@ -305,21 +330,26 @@ int load_blktrace(struct thread_data *td, const char *filename)
 			log_err("fio: discarded %d of %d\n", ret, t.pdu_len);
 			goto err;
 		}
-		if (t.action & BLK_TC_ACT(BLK_TC_NOTIFY))
-			continue;
-		if (!ttime) {
+		if ((t.action & BLK_TC_ACT(BLK_TC_NOTIFY)) == 0) {
+			if (!ttime) {
+				ttime = t.time;
+				cpu = t.cpu;
+			}
+
+			delay = 0;
+			if (cpu == t.cpu)
+				delay = t.time - ttime;
+			if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only)
+				skipped_writes++;
+			else
+				handle_trace(td, &t, delay, ios, rw_bs);
+
 			ttime = t.time;
 			cpu = t.cpu;
-		}
-		delay = 0;
-		if (cpu == t.cpu)
-			delay = t.time - ttime;
-		if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only)
-			skipped_writes++;
-		else
+		} else {
+			delay = 0;
 			handle_trace(td, &t, delay, ios, rw_bs);
-		ttime = t.time;
-		cpu = t.cpu;
+		}
 	} while (1);
 
 	fifo_free(fifo);