Improve EMC controller for AGX Xavier

rbonghi · Feb 4, 2023 · 1ebed17 · 1ebed17
1 parent af58003
commit 1ebed17
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/jtop/core/memory.py b/jtop/core/memory.py
@@ -397,6 +397,8 @@ def get_status(self):
         # Read EMC status
         if os.path.isdir("/sys/kernel/debug/clk/emc"):
             memory['EMC'] = read_engine("/sys/kernel/debug/clk/emc")
+            # Set always online this engine
+            memory['EMC']['online'] = True
             # Percentage utilization
             # https://forums.developer.nvidia.com/t/real-time-emc-bandwidth-with-sysfs/107479/3
             utilization = int(cat("/sys/kernel/actmon_avg_activity/mc_all"))

diff --git a/jtop/gui/pmem.py b/jtop/gui/pmem.py
@@ -169,8 +169,9 @@ def action_swap(self, data):
         if self._swap_pressed != -1:
             # Read name swap
             name = list(swap_table.keys())[self._swap_pressed]
+            swap = swap_table[name]
             # Deactivate SWAP
-            if self.jetson.memory.swap_is_enable(name):
+            if self.jetson.memory.swap_is_enable(name) and swap['type'] == 'file':
                 self.jetson.memory.swap_deactivate(name)
 
     def action_increase(self, data):
@@ -262,22 +263,27 @@ def draw_swap_table(self, pos_y, pos_x, width, height, key, mouse):
     def draw_swap_controller(self, pos_y, pos_x, key, mouse):
         swap_info = self.jetson.memory['SWAP']
         swap_table = swap_info['table']
-        name = ''
+        string_name = ''
+        color = curses.A_REVERSE
         # Read swap name
         if self._swap_pressed != -1:
+            operation = ''
             # Read name swap
             name = list(swap_table.keys())[self._swap_pressed]
             # Get info swap
             swap = swap_table[name]
             if swap['type'] == 'partition':
-                color = NColors.magenta()
+                color = NColors.imagenta()
             elif swap['type'] == 'file':
-                color = NColors.yellow()
+                color = NColors.iyellow()
+                operation = 'Disable '
             else:
-                color = NColors.cyan()
+                color = NColors.icyan()
+            # Swap name and operation
+            string_name = "{operation}{name}".format(operation=operation, name=name)
         # Swap controller button
-        label = 'Disable {name}'.format(name=name) if name else 'Select swap'
-        self._button_swap.draw(pos_y, pos_x, key, mouse, label=label, color=NColors.iyellow())
+        label = string_name if string_name else 'Select swap'
+        self._button_swap.draw(pos_y, pos_x, key, mouse, label=label, color=color)
         # Button create new swap
         self._button_create.draw(pos_y + 2, pos_x, key, mouse, label="Create new")
         # Draw selected number