jinql
/
bpytop
mirror of https://github.com/aristocratos/bpytop
1
0
Fork 0
Code Issues Releases Wiki Activity

UI fixes 

Added a few UI fixes for the new GPU window to behave with the others.

Signed-off-by: Lucas Zampieri <lzampier@redhat.com>
gpu
Lucas Zampieri 2021-08-27 21:13:13 -03:00
parent 2b852042f2
commit e5b2fc7e4e
1 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bpytop.py
View File

@ -60,7 +60,7 @@ VERSION: str = "1.0.67"
#? Argument parser -------------------------------------------------------------------------------> #? Argument parser ------------------------------------------------------------------------------->
args = argparse.ArgumentParser() args = argparse.ArgumentParser()
args.add_argument("-b", "--boxes", action="store", dest="boxes", help = "which boxes to show at start, example: -b \"cpu mem net proc\"") args.add_argument("-b", "--boxes", action="store", dest="boxes", help = "which boxes to show at start, example: -b \"cpu mem net proc gpu\"")
args.add_argument("-lc", "--low-color", action="store_true", help = "disable truecolor, converts 24-bit colors to 256-color") args.add_argument("-lc", "--low-color", action="store_true", help = "disable truecolor, converts 24-bit colors to 256-color")
args.add_argument("-v", "--version", action="store_true", help = "show version info and exit") args.add_argument("-v", "--version", action="store_true", help = "show version info and exit")
args.add_argument("--debug", action="store_true", help = "start with loglevel set to DEBUG overriding value set in config") args.add_argument("--debug", action="store_true", help = "start with loglevel set to DEBUG overriding value set in config")
@ -99,7 +99,7 @@ theme_background=$theme_background
#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
truecolor=$truecolor truecolor=$truecolor
#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace. #* Manually set which boxes to show. Available values are "cpu mem net proc gpu", separate values with whitespace.
shown_boxes="$shown_boxes" shown_boxes="$shown_boxes"
#* Update time in milliseconds, increases automatically if set below internal loops processing time, recommended 2000 ms or above for better sample times for graphs. #* Update time in milliseconds, increases automatically if set below internal loops processing time, recommended 2000 ms or above for better sample times for graphs.
@ -420,7 +420,7 @@ class Config:
color_theme: str = "Default" color_theme: str = "Default"
theme_background: bool = True theme_background: bool = True
truecolor: bool = True truecolor: bool = True
shown_boxes: str = "cpu mem net proc" shown_boxes: str = "cpu mem net proc gpu"
update_ms: int = 2000 update_ms: int = 2000
proc_update_mult: int = 2 proc_update_mult: int = 2
proc_sorting: str = "cpu lazy" proc_sorting: str = "cpu lazy"
@ -574,7 +574,7 @@ class Config:
self.warnings.append(f'Config key "cpu_sensor" does not contain an available sensor!') self.warnings.append(f'Config key "cpu_sensor" does not contain an available sensor!')
if "shown_boxes" in new_config and not new_config["shown_boxes"] == "": if "shown_boxes" in new_config and not new_config["shown_boxes"] == "":
for box in new_config["shown_boxes"].split(): #type: ignore for box in new_config["shown_boxes"].split(): #type: ignore
if not box in ["cpu", "mem", "net", "proc"]: if not box in ["cpu", "mem", "net", "proc", "gpu"]:
new_config["shown_boxes"] = "_error_" new_config["shown_boxes"] = "_error_"
self.warnings.append(f'Config key "shown_boxes" contains invalid box names!') self.warnings.append(f'Config key "shown_boxes" contains invalid box names!')
break break
@ -622,7 +622,7 @@ except Exception as e:
if ARG_BOXES: if ARG_BOXES:
_new_boxes: List = [] _new_boxes: List = []
for _box in ARG_BOXES.split(): for _box in ARG_BOXES.split():
if _box in ["cpu", "mem", "net", "proc"]: if _box in ["cpu", "mem", "net", "proc", "gpu"]:
_new_boxes.append(_box) _new_boxes.append(_box)
CONFIG.shown_boxes = " ".join(_new_boxes) CONFIG.shown_boxes = " ".join(_new_boxes)
del _box, _new_boxes del _box, _new_boxes
@ -1648,7 +1648,7 @@ class Box:
name: str name: str
num: int = 0 num: int = 0
boxes: List = [] boxes: List = []
view_modes: Dict[str, List] = {"full" : ["cpu", "mem", "net", "proc"], "stat" : ["cpu", "mem", "net"], "proc" : ["cpu", "proc"]} view_modes: Dict[str, List] = {"full": ["cpu", "mem", "net", "proc", "gpu"], "stat": ["cpu", "mem", "net"], "proc": ["cpu", "proc"]}
view_mode: str view_mode: str
for view_mode in view_modes: for view_mode in view_modes:
if sorted(CONFIG.shown_boxes.split(), key=str.lower) == view_modes[view_mode]: if sorted(CONFIG.shown_boxes.split(), key=str.lower) == view_modes[view_mode]:
@ -1666,6 +1666,7 @@ class Box:
bg: str bg: str
_b_cpu_h: int _b_cpu_h: int
_b_mem_h: int _b_mem_h: int
_b_proc_h: int
redraw_all: bool redraw_all: bool
buffers: List[str] = [] buffers: List[str] = []
c_counter: int = 0 c_counter: int = 0
@ -1743,6 +1744,7 @@ class Box:
f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[2] {Fx.ub}Toggle MEM box' f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[2] {Fx.ub}Toggle MEM box'
f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[3] {Fx.ub}Toggle NET box' f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[3] {Fx.ub}Toggle NET box'
f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[4] {Fx.ub}Toggle PROC box' f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[4] {Fx.ub}Toggle PROC box'
f'{Mv.d(1)}{Mv.l(18)}{Fx.b}[5] {Fx.ub}Toggle GPU box'
f'{Mv.d(1)}{Mv.l(19)}{Fx.b}[m] {Fx.ub}Cycle presets' f'{Mv.d(1)}{Mv.l(19)}{Fx.b}[m] {Fx.ub}Cycle presets'
f'{Mv.d(1)}{Mv.l(17)}{Fx.b}[q] Quit {Fx.ub}{Term.bg}{Term.fg}') f'{Mv.d(1)}{Mv.l(17)}{Fx.b}[q] Quit {Fx.ub}{Term.bg}{Term.fg}')
@ -2018,6 +2020,7 @@ class CpuBox(Box, SubBox):
Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active) Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active)
cls.resized = cls.redraw = cls.clock_block = False cls.resized = cls.redraw = cls.clock_block = False
class MemBox(Box): class MemBox(Box):
name = "mem" name = "mem"
num = 2 num = 2
@ -2051,8 +2054,8 @@ class MemBox(Box):
Box._b_mem_h = 0 Box._b_mem_h = 0
cls.width = Term.width cls.width = Term.width
return return
width_p: int; height_p: int errlog.debug(f"boxes is {cls.boxes}")
if not "proc" in cls.boxes: if not "proc" in cls.boxes and not "gpu" in cls.boxes:
width_p = 100 width_p = 100
else: else:
width_p = cls.width_p width_p = cls.width_p
@ -2311,6 +2314,7 @@ class MemBox(Box):
Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active) Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active)
cls.resized = cls.redraw = False cls.resized = cls.redraw = False
class NetBox(Box, SubBox): class NetBox(Box, SubBox):
name = "net" name = "net"
num = 3 num = 3
@ -2333,7 +2337,8 @@ class NetBox(Box, SubBox):
if not "net" in cls.boxes: if not "net" in cls.boxes:
cls.width = Term.width cls.width = Term.width
return return
if not "proc" in cls.boxes:
if not "proc" in cls.boxes and not "gpu" in cls.boxes:
width_p = 100 width_p = 100
else: else:
width_p = cls.width_p width_p = cls.width_p
@ -2417,6 +2422,7 @@ class NetBox(Box, SubBox):
Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active) Draw.buffer(cls.buffer, f'{out_misc}{out}{Term.fg}', only_save=Menu.active)
cls.redraw = cls.resized = False cls.redraw = cls.resized = False
class ProcBox(Box): class ProcBox(Box):
name = "proc" name = "proc"
num = 4 num = 4
@ -2450,17 +2456,17 @@ class ProcBox(Box):
@classmethod @classmethod
def _calc_size(cls): def _calc_size(cls):
if not "proc" in cls.boxes: if "proc" not in cls.boxes:
Box._b_proc_h = 0
cls.width = Term.width cls.width = Term.width
return return
width_p: int; height_p: int
if not "net" in cls.boxes and not "mem" in cls.boxes: if not "net" in cls.boxes and not "mem" in cls.boxes:
width_p = 100 width_p = 100
else: else:
width_p = cls.width_p width_p = cls.width_p
if not "cpu" in cls.boxes:
if not "cpu" in cls.boxes or "gpu" in cls.boxes: height_p = 60 if "gpu" in cls.boxes else 98
height_p = 100
else: else:
height_p = cls.height_p height_p = cls.height_p
@ -2471,7 +2477,7 @@ class ProcBox(Box):
cls.y = Box._b_cpu_h + 1 cls.y = Box._b_cpu_h + 1
cls.current_y = cls.y cls.current_y = cls.y
cls.current_h = cls.height cls.current_h = cls.height
Box._b_proc_h = cls.current_h Box._b_proc_h = cls.height
cls.select_max = cls.height - 3 cls.select_max = cls.height - 3
cls.redraw = True cls.redraw = True
cls.resized = True cls.resized = True
@ -2896,20 +2902,14 @@ class GpuBox(Box):
@classmethod @classmethod
def _calc_size(cls): def _calc_size(cls):
# if not "gpu" in cls.boxes: if not "net" in cls.boxes and not "mem" in cls.boxes:
# width_p = 0 width_p = 100
# Box._b_cpu_h = 0 else:
# cls.width = Term.width
# return
# width_p: int
# if cls.stat_mode:
# width_p = 30
# else:
width_p = cls.width_p width_p = cls.width_p
cls.width = round(Term.width * width_p / 100) cls.width = round(Term.width * width_p / 100)
cls.height = Term.height - Box._b_cpu_h - Box._b_cpu_h - 4 cls.height = Term.height - Box._b_cpu_h - Box._b_proc_h
cls.y = Box._b_cpu_h + 24 cls.y = Term.height - cls.height + 1
cls.x = Term.width - cls.width + 1 cls.x = Term.width - cls.width + 1
cls.box_width = 27 if cls.width > 45 else 19 cls.box_width = 27 if cls.width > 45 else 19
cls.box_height = 9 if cls.height > 10 else cls.height - 2 cls.box_height = 9 if cls.height > 10 else cls.height - 2
@ -4242,6 +4242,7 @@ class GpuCollector(Collector):
cls.gpu = cls.gpus[cls.gpu_i] cls.gpu = cls.gpus[cls.gpu_i]
cls.populated = True cls.populated = True
else: else:
nvml.nvmlInit()
if nvml.nvmlDeviceGetCount() == 1: if nvml.nvmlDeviceGetCount() == 1:
cls.gpu = [cls.handle] cls.gpu = [cls.handle]
cls.name = nvml.nvmlDeviceGetName(cls.handle) cls.name = nvml.nvmlDeviceGetName(cls.handle)
@ -4336,8 +4337,8 @@ class GpuCollector(Collector):
} }
else: else:
gpu_stats = nvml.nvmlDeviceGetUtilizationRates(card) gpu_stats = nvml.nvmlDeviceGetUtilizationRates(card)
stat["mem"] = int(gpu_stats.gpu) stat["gpu"] = int(gpu_stats.gpu)
stat["gpu"] = int(gpu_stats.memory) stat["mem"] = int(gpu_stats.memory)
return stat return stat
@ -4485,6 +4486,7 @@ class Menu:
Draw.now(f'{Draw.saved_buffer()}') Draw.now(f'{Draw.saved_buffer()}')
nvml.nvmlShutdown()
cls.background = "" cls.background = ""
cls.active = False cls.active = False
cls.close = False cls.close = False
@ -4514,6 +4516,7 @@ class Menu:
"(2)": "Toggle MEM box.", "(2)": "Toggle MEM box.",
"(3)": "Toggle NET box.", "(3)": "Toggle NET box.",
"(4)": "Toggle PROC box.", "(4)": "Toggle PROC box.",
"(5)": "Toggle GPU box.",
"(d)": "Toggle disks view in MEM box.", "(d)": "Toggle disks view in MEM box.",
"(F2, o)": "Shows options.", "(F2, o)": "Shows options.",
"(F1, shift+h)": "Shows this window.", "(F1, shift+h)": "Shows this window.",
@ -4686,7 +4689,7 @@ class Menu:
"shown_boxes" : [ "shown_boxes" : [
'Manually set which boxes to show.', 'Manually set which boxes to show.',
'', '',
'Available values are "cpu mem net proc".', 'Available values are "cpu mem net proc gpu".',
'Seperate values with whitespace.', 'Seperate values with whitespace.',
'', '',
'Toggle between presets with mode key "m".'], 'Toggle between presets with mode key "m".'],
@ -5173,7 +5176,7 @@ class Menu:
elif selected == "shown_boxes": elif selected == "shown_boxes":
new_boxes: List = [] new_boxes: List = []
for box in input_val.split(): for box in input_val.split():
if box in ["cpu", "mem", "net", "proc"]: if box in ["cpu", "mem", "net", "proc", "gpu"]:
new_boxes.append(box) new_boxes.append(box)
CONFIG.shown_boxes = " ".join(new_boxes) CONFIG.shown_boxes = " ".join(new_boxes)
Box.view_mode = "user" Box.view_mode = "user"
@ -5419,6 +5422,7 @@ class UpdateChecker:
except Exception as e: except Exception as e:
errlog.exception(f'{e}') errlog.exception(f'{e}')
class Init: class Init:
running: bool = True running: bool = True
initbg_colors: List[str] = [] initbg_colors: List[str] = []