From: Jens Axboe <axboe@nelson.(none)>
Date: Tue, 27 Sep 2005 09:04:43 +0000 (+0200)
Subject: Forgot to include the change for the last stopwatch fix...
X-Git-Tag: blktrace-0.99~86
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=53c68c88e22a54e4305ef44dfb3253242dfcb25f;p=blktrace.git

Forgot to include the change for the last stopwatch fix...
---

diff --git a/blkparse.c b/blkparse.c
index c9b3759..7051618 100644
--- a/blkparse.c
+++ b/blkparse.c
@@ -1176,14 +1176,17 @@ static inline int check_stopwatch(struct blk_io_trace *bit)
 	return 1;
 }
 
-static int sort_entries(void)
+/*
+ * return youngest entry read
+ */
+static int sort_entries(unsigned long long *youngest)
 {
 	struct trace *t;
-	int nr = 0;
 
 	if (!genesis_time)
 		find_genesis();
 
+	*youngest = -1ULL;
 	while ((t = trace_list) != NULL) {
 		struct blk_io_trace *bit = t->bit;
 
@@ -1201,12 +1204,13 @@ static int sort_entries(void)
 		}
 
 		if (trace_rb_insert(t))
-			break;
+			return -1;
 
-		nr++;
+		if (bit->time < *youngest)
+			*youngest = bit->time;
 	}
 
-	return nr;
+	return 0;
 }
 
 static void show_entries_rb(int force)
@@ -1412,6 +1416,8 @@ static int do_file(void)
 	 * now loop over the files reading in the data
 	 */
 	do {
+		unsigned long long youngest;
+
 		events_added = 0;
 		last_allowed_time = -1ULL;
 
@@ -1439,7 +1445,10 @@ static int do_file(void)
 			}
 		}
 
-		if (sort_entries() == -1)
+		if (sort_entries(&youngest))
+			break;
+
+		if (youngest > stopwatch_end)
 			break;
 
 		show_entries_rb(0);
@@ -1454,6 +1463,7 @@ static int do_file(void)
 
 static int do_stdin(void)
 {
+	unsigned long long youngest;
 	int fd;
 
 	last_allowed_time = -1ULL;
@@ -1465,7 +1475,10 @@ static int do_stdin(void)
 		if (!events)
 			break;
 	
-		if (sort_entries() == -1)
+		if (sort_entries(&youngest))
+			break;
+
+		if (youngest > stopwatch_end)
 			break;
 
 		show_entries_rb(0);