From: Luis Useche <luis@cis.fiu.edu>
Date: Mon, 5 May 2008 18:53:10 +0000 (+0200)
Subject: Fix problem with -w option
X-Git-Tag: blktrace-1.0.0~31
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7072ee3f2f12a1363d6f7378df3f268350e5bd52;p=blktrace.git

Fix problem with -w option

This patch fixes the problem when the -w option is used in the file mode
(i.e., no fifo mode). It just consists of moving the checking of the
stopwatch_end after the time is updated with genesis. This also includes
the checking of the stopwatch_start.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/blkparse.c b/blkparse.c
index a2badc6..6226e69 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -2418,17 +2418,19 @@ static int handle(struct ms_stream *msp)
 	struct blk_io_trace *bit;
 
 	t = ms_peek(msp);
-	if (t->bit->time > stopwatch_end)
-		return 0;
 
 	bit = t->bit;
 	pdi = msp->pdi;
 	pci = get_cpu_info(pdi, msp->cpu);
 	pci->nelems++;
-
 	bit->time -= genesis_time;
+
+	if (t->bit->time > stopwatch_end)
+		return 0;
+
 	pdi->last_reported_time = bit->time;
-	if (bit->action & (act_mask << BLK_TC_SHIFT))
+	if ((bit->action & (act_mask << BLK_TC_SHIFT))&&
+	    t->bit->time >= stopwatch_start)
 		dump_trace(bit, pci, pdi);
 
 	ms_deq(msp);