diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2018-03-06 12:43:06 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2018-04-18 15:39:40 +0100 |
| commit | ace361a83c09d11257bbee05201131f8c022d89d (patch) | |
| tree | 53771442323139564d31dfaa8da3bb8f60617ac1 | |
| parent | 546db4b8ff85ea081f1e4f3807250d4d00009d46 (diff) | |
scripts/trace.pl: More hash key optimisations
Cache the key count value rather than querying the hash every time.
Also assert that the database does not magically change size after the
fixups.
v2: Rename variable according to style guide [Tvrtko]
v3: Reverted accidental style change and added a blank line. [Tvrtko]
Signed-off-by: John Harrison <John.C.Harrison@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
| -rwxr-xr-x | scripts/trace.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/trace.pl b/scripts/trace.pl index d6686833..6b784ac6 100755 --- a/scripts/trace.pl +++ b/scripts/trace.pl @@ -508,6 +508,7 @@ foreach my $key (keys %db) { } # Fix up incompletes +my $key_count = scalar(keys %db); foreach my $key (keys %db) { next unless exists $db{$key}->{'incomplete'}; @@ -522,7 +523,7 @@ foreach my $key (keys %db) { $next_key = db_key($ring, $ctx, $seqno + $i); $i++; } until ((exists $db{$next_key} and not exists $db{$next_key}->{'incomplete'}) - or $i > scalar(keys(%db))); # ugly stop hack + or $i > $key_count); # ugly stop hack if (exists $db{$next_key}) { $db{$key}->{'notify'} = $db{$next_key}->{'end'}; @@ -541,6 +542,8 @@ my $first_ts; my @sorted_keys = sort {$db{$a}->{'start'} <=> $db{$b}->{'start'}} keys %db; my $re_sort = 0; +die "Database changed size?!" unless scalar(@sorted_keys) == $key_count; + foreach my $key (@sorted_keys) { my $ring = $db{$key}->{'ring'}; my $end = $db{$key}->{'end'}; @@ -565,7 +568,7 @@ foreach my $key (@sorted_keys) { do { $next_key = db_key($ring, $ctx, $seqno + $i); $i++; - } until (exists $db{$next_key} or $i > scalar(keys(%db))); # ugly stop hack + } until (exists $db{$next_key} or $i > $key_count); # ugly stop hack # 20us tolerance if (exists $db{$next_key} and $db{$next_key}->{'start'} < $start + 20) { |