From a141a7cde9a8679385207f2e364e5404eaafc00d Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 5 Oct 2005 10:23:36 +0200 Subject: [PATCH] [PATCH] blkparse: old patch broke the sequence check again --- blkparse.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/blkparse.c b/blkparse.c index ff3742c..52a7e75 100644 --- a/blkparse.c +++ b/blkparse.c @@ -185,7 +185,6 @@ struct trace { struct blk_io_trace *bit; struct rb_node rb_node; struct trace *next; - int skipped; }; static struct rb_root rb_sort_root; @@ -1338,7 +1337,7 @@ static void put_trace(struct per_dev_info *pdi, struct trace *t) } } -static int check_sequence(struct per_dev_info *pdi, struct trace *t) +static int check_sequence(struct per_dev_info *pdi, struct trace *t, int force) { unsigned long expected_sequence = pdi->last_sequence + 1; struct blk_io_trace *bit = t->bit; @@ -1364,13 +1363,10 @@ static int check_sequence(struct per_dev_info *pdi, struct trace *t) __put_trace_last(pdi, __t); return 0; + } else if (!force) { + return 1; } else { skip: - if (!t->skipped) - return 1; - - t->skipped = 1; - if (print_missing) { fprintf(stderr, "(%d,%d): skipping %lu -> %u\n", MAJOR(pdi->dev), MINOR(pdi->dev), @@ -1405,13 +1401,11 @@ static void show_entries_rb(int force) break; } - if (!force) { - if (check_sequence(pdi, t)) - break; + if (check_sequence(pdi, t, force)) + break; - if (bit->time > last_allowed_time) - break; - } + if (!force && bit->time > last_allowed_time) + break; pdi->last_sequence = bit->sequence; -- 2.25.1