macpm 0.15__tar.gz → 0.22__tar.gz

{macpm-0.15 → macpm-0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: macpm
-Version: 0.15
+Version: 0.22
 Summary: Performance monitoring CLI tool for Apple Silicon
 Home-page: https://github.com/visualcjy/macpm
 Author: Jinyu Chen

{macpm-0.15 → macpm-0.22}/README.md

@@ -5,8 +5,8 @@ or: pip install macpm
 
 enhanced MAC Performance monitoring CLI tool for Apple Silicon
 
-![](images/macpm.png)
-
+![](images/macpm-v.gif)
+![](images/macpm.gif)
 ```shell
 pip install macpm
 ```
@@ -19,6 +19,7 @@ forked form https://github.com/tlkh/asitop
 3. adjust the hard coded max power in CPU/GPU/ANE
 4. change the way to call powermetrics, no temp files in /tmp 
 5. press ESC or q to quit
+6. press LEFT or RIGHT to switch color, press 1 : default view, 2 : show_core view
 
 A Python-based `nvtop`-inspired command line tool for Apple Silicon (aka M1) Macs.
 

{macpm-0.15 → macpm-0.22}/macpm/macpm.py

@@ -9,7 +9,7 @@ import psutil
 import plistlib
 import curses
 
-version = 'macpm v0.15'
+version = 'macpm v0.22'
 parser = argparse.ArgumentParser(
     description=f'{version}: Performance monitoring CLI tool for Apple Silicon')
 parser.add_argument('--interval', type=int, default=1,
@@ -253,12 +253,13 @@ def parse_cpu_metrics(powermetrics_parse):
             core = e_core if name[0] == 'E' else p_core
             core.append(cpu["cpu"])
             cpu_metric_dict[name + str(cpu["cpu"]) + "_freq_Mhz"] = int(cpu["freq_hz"] / (1e6))
-            cpu_metric_dict[name + str(cpu["cpu"]) + "_active"] = int((1 - cpu["idle_ratio"]) * 100)
+            idle_ratio = cluster["down_ratio"] + (1 - cluster["down_ratio"]) * (cpu["idle_ratio"] + cpu["down_ratio"])
+            cpu_metric_dict[name + str(cpu["cpu"]) + "_active"] = int((1 - idle_ratio) * 100)           
             if name[0] == 'E':
-                e_total_idle_ratio += cluster["down_ratio"] + (1 - cluster["down_ratio"]) * (cpu["idle_ratio"] + cpu["down_ratio"])
+                e_total_idle_ratio += idle_ratio
                 e_core_count += 1
             else:
-                p_total_idle_ratio += cluster["down_ratio"] + (1 - cluster["down_ratio"]) * (cpu["idle_ratio"] + cpu["down_ratio"])
+                p_total_idle_ratio += idle_ratio
                 p_core_count += 1
     
     cpu_metric_dict["E-Cluster_active"] = int((1 - e_total_idle_ratio/e_core_count)*100)
@@ -340,6 +341,7 @@ class DefaultView():
         self.disk_write_bps_peak = 0
         self.network_in_bps_peak = 0
         self.network_out_bps_peak = 0
+        self.default_cpu_perline = 8
         self.construct(soc_info_dict,args)
         
     def construct(self,soc_info_dict,args):
@@ -351,15 +353,34 @@ class DefaultView():
         self.e_core_count = soc_info_dict["e_core_count"]
         self.e_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(self.e_core_count)]
         self.p_core_count = soc_info_dict["p_core_count"]
-        self.p_core_gauges = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(min(self.p_core_count, 8))]
-        self.p_core_split = [HSplit(
-            *self.p_core_gauges,
-        )]
-        if self.p_core_count > 8:
-            self.p_core_gauges_ext = [VGauge(val=0, color=args.color, border_color=args.color) for _ in range(self.p_core_count - 8)]
+        self.max_cpu_perline = self.default_cpu_perline
+        for i in range(int(self.default_cpu_perline/2),self.default_cpu_perline):
+            if self.p_core_count % i == 0:
+                self.max_cpu_perline = i
+                break
+        import math
+        p_core_lines = math.ceil(self.p_core_count / self.max_cpu_perline)
+        self.p_core_gauges = []
+        self.p_core_split = []
+        for i in range(p_core_lines):
+            self.p_core_gauges.append([])
+            self.p_core_gauges[i].extend([VGauge(val=0, color=args.color, border_color=args.color) for _ in range(self.max_cpu_perline if i < p_core_lines - 1 else self.p_core_count - i * self.max_cpu_perline)])
             self.p_core_split.append(HSplit(
-                *self.p_core_gauges_ext,
+                *self.p_core_gauges[i],
             ))
+        if args.show_cores:
+            self.processor_gauges = [self.cpu1_gauge,
+                            HSplit(*self.e_core_gauges),
+                            self.cpu2_gauge,]
+            #for i in range(len(self.p_core_split)):
+            self.processor_gauges.extend(self.p_core_split)
+            self.processor_gauges.extend(self.gpu_ane_gauges)
+        else:
+            self.processor_gauges = [
+                HSplit(self.cpu1_gauge, self.cpu2_gauge),
+                HSplit(*self.gpu_ane_gauges)
+            ]
+        """
         self.processor_gauges = [self.cpu1_gauge,
                             HSplit(*self.e_core_gauges),
                             self.cpu2_gauge,
@@ -369,6 +390,7 @@ class DefaultView():
             HSplit(self.cpu1_gauge, self.cpu2_gauge),
             HSplit(*self.gpu_ane_gauges)
         ]
+        """
         self.processor_split = VSplit(
             *self.processor_gauges,
             title="Processor Utilization",
@@ -515,12 +537,14 @@ class DefaultView():
                 self.e_core_gauges[i].color = args.color
                 self.e_core_gauges[i].border_color = args.color
             for i in range(len(self.p_core_gauges)):
-                self.p_core_gauges[i].color = args.color
-                self.p_core_gauges[i].border_color = args.color
+                for j in range(len(self.p_core_gauges[i])):
+                    self.p_core_gauges[i][j].color = args.color
+                    self.p_core_gauges[i][j].border_color = args.color
+            """
             for i in range(len(self.p_core_gauges_ext)):
                 self.p_core_gauges_ext[i].color = args.color
                 self.p_core_gauges_ext[i].border_color = args.color
-        
+            """
         thermal_pressure = parse_thermal_pressure(powermetrics_parse)
         cpu_metrics_dict = parse_cpu_metrics(powermetrics_parse)
         gpu_metrics_dict = parse_gpu_metrics(powermetrics_parse)
@@ -577,13 +601,14 @@ class DefaultView():
                     core_count += 1
                 core_count = 0
                 for i in cpu_metrics_dict["p_core"]:
-                    core_gauges =self.p_core_gauges if core_count < 8 else self.p_core_gauges_ext
-                    core_gauges[core_count % 8].title = "".join([
+                    #core_gauges =self.p_core_gauges if core_count < 8 else self.p_core_gauges_ext
+                    core_gauges = self.p_core_gauges[int(core_count / self.max_cpu_perline)]
+                    core_gauges[core_count % self.max_cpu_perline].title = "".join([
                         ("Core-" if self.p_core_count < 6 else 'C-') + str(i + 1) + " ",
                         str(cpu_metrics_dict["P-Cluster" + str(i) + "_active"]),
                         "%",
                     ])
-                    core_gauges[core_count % 8].value = cpu_metrics_dict["P-Cluster" + str(i) + "_active"]
+                    core_gauges[core_count % self.max_cpu_perline].value = cpu_metrics_dict["P-Cluster" + str(i) + "_active"]
                     core_count += 1
 
             self.gpu_gauge.title = "".join([
@@ -766,7 +791,7 @@ class DefaultView():
             disk_read_iops = disk_metrics_dict["read_iops"]
             if disk_read_iops > self.disk_read_iops_peak:
                 self.disk_read_iops_peak = disk_read_iops
-            self.disk_read_iops_charts.title = "Read iops: "+ f'{disk_read_iops} (peak: {self.disk_read_iops_peak})'
+            self.disk_read_iops_charts.title = "Read iops: "+ f'{disk_read_iops}'
             if self.disk_read_iops_charts.datapoints:
                 disk_read_iops_rate = int(disk_read_iops / self.disk_read_iops_peak * 100) if self.disk_read_iops_peak > 0 else 0
             else:
@@ -776,7 +801,7 @@ class DefaultView():
             disk_write_iops = disk_metrics_dict["write_iops"]
             if disk_write_iops > self.disk_write_iops_peak:
                 self.disk_write_iops_peak = disk_write_iops
-            self.disk_write_iops_charts.title = "Write iops: "+ f'{disk_write_iops} (peak: {self.disk_write_iops_peak})'
+            self.disk_write_iops_charts.title = "Write iops: "+ f'{disk_write_iops}'
             if self.disk_write_iops_charts.datapoints:
                 disk_write_iops_rate = int(disk_read_iops / self.disk_write_iops_peak * 100) if self.disk_write_iops_peak > 0 else 0
             else:
@@ -786,7 +811,7 @@ class DefaultView():
             disk_read_bps = disk_metrics_dict["read_Bps"]
             if disk_read_bps > self.disk_read_bps_peak:
                 self.disk_read_bps_peak = disk_read_bps
-            self.disk_read_bps_charts.title = "Read : "+ f'{format_number(disk_read_bps)}/s (peak: {format_number(self.disk_read_bps_peak)}/s)'
+            self.disk_read_bps_charts.title = "Read : "+ f'{format_number(disk_read_bps)}/s'
             if self.disk_read_bps_charts.datapoints:
                 disk_read_bps_rate = int(disk_read_bps / self.disk_read_bps_peak * 100) if self.disk_read_bps_peak > 0 else 0
             else:
@@ -796,7 +821,7 @@ class DefaultView():
             disk_write_bps = disk_metrics_dict["write_Bps"]
             if disk_write_bps > self.disk_write_bps_peak:
                 self.disk_write_bps_peak = disk_write_bps
-            self.disk_write_bps_charts.title = "Write : "+ f'{format_number(disk_write_bps)}/s (peak: {format_number(self.disk_write_bps_peak)}/s)'
+            self.disk_write_bps_charts.title = "Write : "+ f'{format_number(disk_write_bps)}/s'
             if self.disk_write_bps_charts.datapoints:
                 disk_write_bps_rate = int(disk_write_bps / self.disk_write_bps_peak * 100) if self.disk_write_bps_peak > 0 else 0
             else:
@@ -806,7 +831,7 @@ class DefaultView():
             network_in_bps = network_metrics_dict["in_Bps"]
             if network_in_bps > self.network_in_bps_peak:
                 self.network_in_bps_peak = network_in_bps
-            self.network_in_bps_charts.title = "in : "+ f'{format_number(network_in_bps)}/s (peak: {format_number(self.network_in_bps_peak)}/s)'
+            self.network_in_bps_charts.title = "in : "+ f'{format_number(network_in_bps)}/s'
             if self.network_in_bps_charts.datapoints:
                 network_in_bps_rate = int(network_in_bps / self.network_in_bps_peak * 100) if self.network_in_bps_peak > 0 else 0
             else:
@@ -816,23 +841,26 @@ class DefaultView():
             network_out_bps = network_metrics_dict["out_Bps"]
             if network_out_bps > self.network_out_bps_peak:
                 self.network_out_bps_peak = network_out_bps
-            self.network_out_bps_charts.title = "out : "+ f'{format_number(network_out_bps)}/s (peak: {format_number(self.network_out_bps_peak)}/s)'
+            self.network_out_bps_charts.title = "out : "+ f'{format_number(network_out_bps)}/s'
             if self.network_out_bps_charts.datapoints:
                 network_out_bps_rate = int(network_out_bps / self.network_out_bps_peak * 100)  if self.network_out_bps_peak > 0 else 0
             else:
                 network_out_bps_rate = 100
             self.network_out_bps_charts.append(network_out_bps_rate)
 
+            self.disk_io_charts.title = ''.join([f"Disk IO  (peak R:{self.disk_read_iops_peak} W:{self.disk_write_iops_peak}",
+                f" | R:{format_number(self.disk_read_bps_peak)}/s W:{format_number(self.disk_write_bps_peak)}/s)"
+            ])
+            self.network_io_charts.title = f"Network IO  (peak in:{format_number(self.network_in_bps_peak)}/s out:{format_number(self.network_out_bps_peak)}/s)"
             self.ui.display()
 
 def get_avg(inlist):
     avg = sum(inlist) / len(inlist)
     return avg
 
-def main(stdscr):
+def begin(stdscr):
     soc_info_dict = get_soc_info()
-    view1 = DefaultView(soc_info_dict=soc_info_dict,args=args)
-    clear_console()
+    view1 = None
     stdscr.nodelay(True)
     view = 1
     try:
@@ -844,6 +872,9 @@ def main(stdscr):
             data = data + output
             str_output = output.decode()
             if str_output.startswith('</plist>'):
+                if view1 is None:
+                    view1 = DefaultView(soc_info_dict=soc_info_dict,args=args)
+                    clear_console()
                 data = data.replace(b'\x00',b'')
                 powermetrics_parse = plistlib.loads(data)
                 key = stdscr.getch()
@@ -882,18 +913,15 @@ def main(stdscr):
 
     return 
 
-
-if __name__ == "__main__":
+def main():
+    global powermetrics_process
     print(f"\n{version} - enhanced MAC Performance monitoring CLI tool for Apple Silicon")
     print("You can update macpm by running `pip install macpm --upgrade`")
     print("Get help at `https://github.com/visualcjy/macpm`")
     print("P.S. You are recommended to run macpm with `sudo macpm`\n")
     print("\n[1/3] Loading macpm\n")
-    print("\033[?25l")
-    #global powermetrics_process
- 
     print("\n[2/3] Starting powermetrics process\n")
-
+    pause = os.popen("sudo echo").read()
     command = " ".join([
         "sudo nice -n",
         str(10),
@@ -906,9 +934,14 @@ if __name__ == "__main__":
     powermetrics_process = subprocess.Popen(command.split(" "), stdin=PIPE, stdout=PIPE)
 
     print("\n[3/3] Waiting for first reading...\n")
-
-    curses.wrapper(main)
+    print("\033[?25l")
+    curses.wrapper(begin)
     print("\033[?25h")
+
+if __name__ == "__main__":
+
+    main()
+ 
     try:
         powermetrics_process.terminate()
         print("Successfully terminated powermetrics process")

{macpm-0.15 → macpm-0.22}/macpm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: macpm
-Version: 0.15
+Version: 0.22
 Summary: Performance monitoring CLI tool for Apple Silicon
 Home-page: https://github.com/visualcjy/macpm
 Author: Jinyu Chen

{macpm-0.15 → macpm-0.22}/setup.py

@@ -4,7 +4,7 @@ long_description = 'Performance monitoring CLI tool for Apple Silicon'
 
 setup(
     name='macpm',
-    version='0.15',
+    version='0.22',
     author='Jinyu Chen',
     author_email='visualcjy@mail.com',
     url='https://github.com/visualcjy/macpm',