Skip to content

Commit

Permalink
Improvements for #71
Browse files Browse the repository at this point in the history
  • Loading branch information
louwrentius committed Apr 12, 2023
1 parent d713436 commit 3087627
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
14 changes: 10 additions & 4 deletions fio_plot/fiolib/argparsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,18 @@ def set_arguments(settings):
setting may smooth out issues you may want to be aware of.",
)
ag.add_argument(
"-x",
"--min-y",
help="Optional minimal value for y-axis. Use 'None' to disable.",
type=str,
"--min-iops",
help=f"Optional minimal value for iops axis, default is {settings['min_iops']}",
type=int,
default=0,
)
ag.add_argument(
"--min-lat",
help=f"Optional minimal value for lat axis, default is {settings['min_lat']}",
type=int,
default=0,
)

ag.add_argument(
"-t",
"--type",
Expand Down
4 changes: 2 additions & 2 deletions fio_plot/fiolib/bar2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def set_max_yaxis(settings, axes):
for ax in axes:
if ax.get_ylabel() == "IOPS":
if settings["max_iops"]:
ax.set_ylim(0,settings["max_iops"])
ax.set_ylim(settings["min_iops"],settings["max_iops"])
if "Latency" in ax.get_ylabel():
if settings["max_lat"]:
ax.set_ylim(0,settings["max_lat"])
ax.set_ylim(settings["min_lat"],settings["max_lat"])

def calculate_font_size(settings, x_axis):
max_label_width = max(ts.get_max_width([x_axis], len(x_axis)))
Expand Down
2 changes: 2 additions & 0 deletions fio_plot/fiolib/defaultsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

def get_default_settings():
settings = {}
settings["min_lat"] = 0
settings["min_iops"] = 0
settings["filter"] = ['read','write']
settings["type"] = []
settings["dpi"] = 200
Expand Down
10 changes: 1 addition & 9 deletions fio_plot/fiolib/graph2dsupporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,13 @@ def get_padding(label, maxlabelsize):

def scale_2dgraph_yaxis(settings, item, rw, maximum):
factordict = {"iops": 1.05, "lat": 1.25, "bw": 1.5, "slat": 1.25, "clat": 1.25 }
min_y = 0
if settings["min_y"] == "None":
min_y = None
else:
try:
min_y = int(settings["min_y"])
except ValueError:
print("Min_y value is invalid (not None or integer).")

max_y = maximum["total"][item["type"]] * factordict[item["type"]]

if settings[f"max_{item['type']}"]:
max_y = settings[f"max_{item['type']}"]

return (min_y, max_y)
return (0, max_y)


def validate_colors(colors):
Expand Down
2 changes: 1 addition & 1 deletion fio_plot/fiolib/iniparsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def read_ini_file(filename):
def get_settings_from_ini(args):
listtypes = ['input_directory','filter','colors','type']
listinttypes = ['iodepth','numjobs']
integers = ['maxdepth','maxjobs','dpi','max_z','max_lat','max_iops','max_bw','xlabel_depth','xlabel_parent','xlabel_segment_size','line_width','source_fontsize','subtitle_fontsize','title_fontsize']
integers = ['maxdepth','maxjobs','dpi','max_z','max_lat','max_iops','min_lat','min_iops','max_bw','xlabel_depth','xlabel_parent','xlabel_segment_size','line_width','source_fontsize','subtitle_fontsize','title_fontsize']
floats = ['percentile']
booltypes = ['show_cpu','show_ss','table_lines','disable_grid','enable_markers','disable_fio_version','moving_average']
returndict = {}
Expand Down

0 comments on commit 3087627

Please sign in to comment.