Skip to content

Fix program crash on "m" with large value of "current" #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stesser wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix program crash on "m" with large value of "current" #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a05df
Update zpool-iostat-viz
stesser Nov 13, 2021
bd40c46
Update zpool-iostat-viz
stesser Nov 13, 2021
5f18d7d
Update zpool-iostat-viz
stesser Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions zpool-iostat-viz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,19 @@ def render_stats(window, transform, should_show_differential, pool, filename=Non
elif in_key == ord('d'):
should_show_differential = not should_show_differential
elif in_key == ord('m'):
stats = None
stats_history = []
Copy link
Owner

@chadmiller chadmiller Nov 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of discarding recent history, I'd prefer it if stats and stats_history were unaffected by views and transforming functions were only used to interpret the raw data.

Copy link
Contributor Author

@stesser stesser Nov 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you do not want to clear the stats_history array, I'd assume that you need two arrays, one for the device centric view, the other for the measurements centric view.
Always applying both transforms and just selecting one of 2 stats and stats_history arrays for display would be a simple change, but my main intend was to provide a fix for the issue that resulted from the addition of the "m" command.
If you provide 2 sets of arrays and put the restriction of "current" to the allowed index range at the start of the loop, then resetting of current to 0 could also be dropped.
I'll update the FreeBSD port to whatever you decide to implement.

current = 0
load_time = None
if transform == stats_as_device_centric:
transform = stats_as_measurement_centric
else:
transform = stats_as_device_centric
elif in_key == ord('q') or in_key == ord('x') or in_key == 27:
return
current += len(stats)
current %= len(stats)
if stats:
current += len(stats)
current %= len(stats)


def main(window, should_show_differential, pool, filename, views):
Expand Down