New command /cpuinfo

Competitive:
- Match reset fixed

Author: karel26

core/utils/cpu.py

@@ -4,6 +4,7 @@
 import winreg
 
 from ctypes import wintypes
+from io import BytesIO
 from matplotlib import pyplot as plt, patches
 
 logger = logging.getLogger(__name__)
@@ -386,7 +387,7 @@ def get_cache_info():
     return sorted(cache_info, key=lambda x: x['level'])
 
 
-def create_cpu_topology_visualization(p_cores, e_cores, cache_structure):
+def create_cpu_topology_visualization(p_cores, e_cores, cache_structure, display: bool = False):
     plt.style.use('dark_background')
     fig, ax = plt.subplots(figsize=(20, 12))
     ax.set_aspect('equal')
@@ -403,9 +404,9 @@ def create_cpu_topology_visualization(p_cores, e_cores, cache_structure):
     core_height = 0.8
     core_gap = 0.4
     x_spacing = core_width + core_gap
-    y_spacing = 1.0
+    y_spacing = 1.2
     l3_height = 0.8
-    l3_spacing = 0.8
+    l3_spacing = 0
 
     # Calculate layout dimensions
     p_cores_per_row = len(p_cores) // 2
@@ -587,14 +588,22 @@ def format_size(size):
     ax.set_ylim(-4, max(p_rows, e_rows) * y_spacing * 3 + margin)
     ax.axis('off')
 
-    plt.title("CPU Topology with Cache Hierarchy", color=text_color, y=0.98)
+    plt.title(f"CPU Topology with Cache Hierarchy for {get_cpu_name()}", color=text_color, y=0.98)
 
     # Set figure background to dark
     fig.patch.set_facecolor('#1C1C1C')
     ax.set_facecolor('#1C1C1C')
 
     plt.tight_layout()
-    plt.show()
+
+    buf = BytesIO()
+    plt.savefig(buf, format='png', facecolor='#1C1C1C')
+    if display:
+        plt.show()
+
+    plt.close(fig)  # Close the figure to free memory
+    buf.seek(0)
+    return buf
 
 
 if __name__ == '__main__':
@@ -610,14 +619,17 @@ def format_size(size):
             print(f"Scheduling Class {plcass}: {get_cpus_from_affinity(affinity_mask)}")
         print("\nCache Information:")
         cache_info = get_cache_info()
-        for cache in cache_info:
-            cache_type = ['Unified', 'Instruction', 'Data', 'Trace'][cache['type']]
-            print(f"L{cache['level']} {cache_type} Cache:")
-            print(f"  Size: {cache['size']/1024:.0f}KB")
-            print(f"  Line Size: {cache['line_size']} bytes")
-            print(f"  Shared by cores: {cache['cores']}")
+        try:
+            for cache in cache_info:
+                cache_type = ['Unified', 'Instruction', 'Data', 'Trace'][cache['type']]
+                print(f"L{cache['level']} {cache_type} Cache:")
+                print(f"  Size: {cache['size']/1024:.0f}KB")
+                print(f"  Line Size: {cache['line_size']} bytes")
+                print(f"  Shared by cores: {cache['cores']}")
+        except Exception:
+            pass
         create_cpu_topology_visualization(get_cpus_from_affinity(p_core_affinity_mask),
                                           get_cpus_from_affinity(e_core_affinity_mask),
-                                          cache_info)
+                                          cache_info, True)
     except Exception as e:
         traceback.print_exc()

plugins/competitive/listener.py

@@ -420,6 +420,9 @@ async def onGameEvent(self, server: Server, data: dict) -> None:
 
     @event(name="onMatchFinished")
     async def onMatchFinished(self, server: Server, data: dict) -> None:
+        match = self.matches[server.name].pop(data['match_id'])
+        match.finished = datetime.now(timezone.utc)
+
         # unlock players
         if data['match_id'] == GLOBAL_MATCH_ID:
             for ucid in self.in_match[server.name].keys():
@@ -454,7 +457,6 @@ async def check_matches(self):
         for server in self.bot.servers.values():
             if server.status != Status.RUNNING:
                 continue
-            finished: list[Match] = []
             for match in self.matches.get(server.name, {}).values():
                 winner: Side = match.winner
                 if match.finished or not winner:
@@ -476,17 +478,10 @@ async def check_matches(self):
                 for player in match.teams[Side.BLUE] + match.teams[Side.RED]:
                     message += f"- {player.name}: {self.calculate_rating(await self.get_rating(player))}\n"
                 asyncio.create_task(self.inform_players(match, message, 60))
-                finished.append(match)
 
                 asyncio.create_task(self.bot.bus.send_to_node({
                     "command": "onMatchFinished",
                     "match_id": match.match_id,
                     "winner": winner.name,
                     "server_name": server.name
                 }))
-
-            # cleanup
-            for match in finished:
-                match.finished = datetime.now(timezone.utc)
-                if match.match_id != GLOBAL_MATCH_ID:
-                    del self.matches[server.name][match.match_id]

plugins/serverstats/commands.py

@@ -133,6 +133,22 @@ async def serverstats(self, interaction: discord.Interaction,
         except ValueNotInRange as ex:
             await interaction.followup.send(ex, ephemeral=utils.get_ephemeral(interaction))
 
+    @command(description='Shows CPU topology')
+    @app_commands.guild_only()
+    @utils.app_has_role('Admin')
+    async def cpuinfo(self, interaction: discord.Interaction):
+        p_core_affinity_mask = utils.get_p_core_affinity()
+        e_core_affinity_mask = utils.get_e_core_affinity()
+        buffer = utils.create_cpu_topology_visualization(utils.get_cpus_from_affinity(p_core_affinity_mask),
+                                                         utils.get_cpus_from_affinity(e_core_affinity_mask),
+                                                         utils.get_cache_info())
+        try:
+            discord.File(fp=buffer, filename='cpuinfo.png')
+            # noinspection PyUnresolvedReferences
+            await interaction.response.send_message(file=discord.File(fp=buffer, filename='cpuinfo.png'))
+        finally:
+            buffer.close()
+
     @tasks.loop(hours=12.0)
     async def cleanup(self):
         async with self.apool.connection() as conn: