Merge branch 'main' into fix/high_glibc_attach

bppps · web-flow · commit 72aa22930e15 · 2026-03-25T11:26:22.000+08:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# Code owners for this repository
+# These users will be requested for review when someone opens a pull request
+
+# Default owners for everything in the repo
+* @bppps
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,3 @@ setup.py
 .vscode/*
 *.iml
 .qoder/*
-.demo/*
diff --git a/flight_profiler/help_descriptions.py b/flight_profiler/help_descriptions.py
@@ -11,10 +11,14 @@
 
 from flight_profiler.utils.env_util import is_linux
 from flight_profiler.utils.render_util import (
+    BOX_HORIZONTAL,
+    BOX_T_RIGHT,
     COLOR_BOLD,
     COLOR_BRIGHT_GREEN,
     COLOR_END,
+    COLOR_FAINT,
     COLOR_WHITE_255,
+    ICON_ARROW,
     align_prefix,
 )
 
@@ -49,32 +53,36 @@ def help_hint(self) -> str:
         return self._help
 
     def _build_help_msg(self) -> str:
+        # Section title style
+        section_prefix = f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}{BOX_T_RIGHT}{BOX_HORIZONTAL}"
+        section_suffix = f"{COLOR_END}"
+
         usage = ""
         for single_usage in self._usage:
-            usage += f"  {COLOR_WHITE_255}{single_usage}{COLOR_END}\n"
+            usage += f"  {COLOR_WHITE_255}{ICON_ARROW} {single_usage}{COLOR_END}\n"
         examples = ""
         for single_example in self._examples:
-            examples += f"  {COLOR_WHITE_255}{single_example}{COLOR_END}\n"
+            examples += f"  {COLOR_FAINT}{ICON_ARROW}{COLOR_END} {COLOR_WHITE_255}{single_example}{COLOR_END}\n"
         options = ""
         if self._options is not None:
             for option in self._options:
-                options += f"{COLOR_WHITE_255}{option[0].ljust(self._option_offset)}{align_prefix(self._option_offset, option[1])}{COLOR_END}\n"
+                options += f"  {COLOR_WHITE_255}{option[0].ljust(self._option_offset)}{align_prefix(self._option_offset + 2, option[1])}{COLOR_END}\n"
 
         wiki_description = ""
         if self._wiki is not None:
             wiki_description = (
-                f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}WIKI:{COLOR_END}\n"
+                f"{section_prefix} WIKI{section_suffix}\n"
                 f"  {COLOR_WHITE_255}{self._wiki}{COLOR_END}\n\n"
             )
         return (
-            f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}USAGE:{COLOR_END}\n"
+            f"{section_prefix} USAGE{section_suffix}\n"
             f"{usage}\n"
-            f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}SUMMARY:{COLOR_END}\n"
+            f"{section_prefix} SUMMARY{section_suffix}\n"
             f"  {COLOR_WHITE_255}{self._summary}{COLOR_END}\n\n"
-            f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}EXAMPLES:{COLOR_END}\n"
+            f"{section_prefix} EXAMPLES{section_suffix}\n"
             f"{examples}\n"
             f"{wiki_description}"
-            f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}OPTIONS:{COLOR_END}\n"
+            f"{section_prefix} OPTIONS{section_suffix}\n"
             f"{options}"
         )
 
diff --git a/flight_profiler/plugins/getglobal/server_plugin_getglobal.py b/flight_profiler/plugins/getglobal/server_plugin_getglobal.py
@@ -7,6 +7,7 @@
     GetGlobalParser,
 )
 from flight_profiler.plugins.server_plugin import Message, ServerPlugin, ServerQueue
+from flight_profiler.utils.render_util import build_error_message
 
 
 class GetGlobalServerPlugin(ServerPlugin):
@@ -27,7 +28,7 @@ async def do_action(self, param):
             )
         except:
             self.out_q.output_msg_nowait(
-                Message(True, pickle.dumps(traceback.format_exc()))
+                Message(True, pickle.dumps(build_error_message(traceback.format_exc())))
             )
 
 
diff --git a/flight_profiler/plugins/help/help_agent.py b/flight_profiler/plugins/help/help_agent.py
@@ -21,11 +21,16 @@
 )
 from flight_profiler.utils.env_util import py_higher_than_314, readline_enable
 from flight_profiler.utils.render_util import (
+    BOX_HORIZONTAL,
+    CMD_ICON_HELP,
     COLOR_BOLD,
     COLOR_BRIGHT_GREEN,
     COLOR_END,
+    COLOR_FAINT,
     COLOR_WHITE_255,
     align_prefix,
+    get_command_icon,
+    ljust_display,
 )
 
 HELP_COMMANDS_DESCRIPTIONS: List[CommandDescription] = [
@@ -86,12 +91,21 @@ def __init__(self):
 
     def display_all_commands(self):
         """
-        help default show all command
+        help default show all command with icons
         """
         display_msg = ""
-        display_msg += f"{COLOR_WHITE_255}{COLOR_BOLD}{'NAME':<15}{align_prefix(15, 'DESCRIPTION')}{COLOR_END}\n"
+        # Header with icon
+        display_msg += f"{COLOR_BRIGHT_GREEN}{COLOR_BOLD}{CMD_ICON_HELP} [AVAILABLE COMMANDS]{COLOR_END}\n"
+        display_msg += f"{COLOR_FAINT}{BOX_HORIZONTAL * 25}{COLOR_END}\n"
+        # Column headers
+        display_msg += f"{COLOR_WHITE_255}{COLOR_BOLD}{'':3}{'NAME':<12}{'DESCRIPTION'}{COLOR_END}\n"
         for c_idx in range(len(HELP_COMMANDS_NAMES)):
-            display_msg += f"{COLOR_BRIGHT_GREEN}{HELP_COMMANDS_NAMES[c_idx]:<15}{COLOR_END}{align_prefix(15, HELP_COMMANDS_DESCRIPTIONS[c_idx].summary)}\n"
+            cmd_name = HELP_COMMANDS_NAMES[c_idx]
+            cmd_icon = get_command_icon(cmd_name)
+            # Use ljust_display to handle emoji width correctly
+            icon_part = ljust_display(cmd_icon, 2)
+            name_part = ljust_display(cmd_name, 12)
+            display_msg += f"{COLOR_FAINT}{icon_part}{COLOR_END} {COLOR_BRIGHT_GREEN}{name_part}{COLOR_END}{align_prefix(15, HELP_COMMANDS_DESCRIPTIONS[c_idx].summary)}\n"
         return display_msg
 
     def get_command_description(self, command_name: str) -> str:
diff --git a/flight_profiler/plugins/perf/cli_plugin_perf.py b/flight_profiler/plugins/perf/cli_plugin_perf.py
@@ -5,9 +5,13 @@
 from flight_profiler.help_descriptions import PERF_COMMAND_DESCRIPTION
 from flight_profiler.plugins.cli_plugin import BaseCliPlugin
 from flight_profiler.plugins.perf.perf_parser import PerfParams, global_perf_parser
-from flight_profiler.utils.cli_util import show_error_info, show_normal_info
+from flight_profiler.utils.cli_util import (
+    show_error_info,
+    show_info_with_icon,
+    show_normal_info,
+    show_success_info,
+)
 from flight_profiler.utils.env_util import is_linux
-from flight_profiler.utils.render_util import COLOR_GREEN
 
 
 class PerfCliPlugin(BaseCliPlugin):
@@ -44,7 +48,7 @@ def __dump_to_flamegraph(self, params: PerfParams, cmd: str):
             command, stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
         try:
-            show_normal_info(f"Press Control-C to exit.")
+            show_info_with_icon("Press Control-C to exit.")
             self.__capture_process(process, params)
         except KeyboardInterrupt:
             process.send_signal(signal.SIGINT)
@@ -53,8 +57,8 @@ def __dump_to_flamegraph(self, params: PerfParams, cmd: str):
     def __capture_process(self, process: subprocess.Popen, params: PerfParams) -> None:
         stdout, stderr = process.communicate()
         if process.returncode == 0:
-            show_normal_info(
-                f" Flamegraph data has been successfully written to {COLOR_GREEN}{params.filepath}!"
+            show_success_info(
+                f"Flamegraph data has been successfully written to {params.filepath}!"
             )
         else:
             show_error_info(stderr.decode())
diff --git a/flight_profiler/plugins/stack/cli_plugin_stack.py b/flight_profiler/plugins/stack/cli_plugin_stack.py
@@ -5,9 +5,8 @@
 from flight_profiler.help_descriptions import STACK_COMMAND_DESCRIPTION
 from flight_profiler.plugins.cli_plugin import BaseCliPlugin
 from flight_profiler.plugins.stack.stack_parser import StackParams, global_stack_parser
-from flight_profiler.utils.cli_util import show_error_info
+from flight_profiler.utils.cli_util import show_error_info, show_success_info
 from flight_profiler.utils.env_util import is_linux
-from flight_profiler.utils.render_util import COLOR_END, COLOR_GREEN
 
 
 class StackCliPlugin(BaseCliPlugin):
@@ -52,8 +51,8 @@ def __analyze_under_linux(self, params: StackParams):
                 for line in thread_lines:
                     print(line, file=f, flush=True)
             stack_literal = "native stack" if params.native else "stack"
-            print(
-                f"{COLOR_GREEN}write {stack_literal} to {params.filepath} successfully!{COLOR_END}"
+            show_success_info(
+                f"Write {stack_literal} to {params.filepath} successfully!"
             )
 
     def __show_coroutine_stacks(self, params: StackParams):
@@ -80,8 +79,8 @@ def __show_coroutine_stacks(self, params: StackParams):
                 with open(params.filepath, "w") as f:
                     for line in coro_lines:
                         print(line, file=f, flush=True)
-                print(
-                    f"{COLOR_GREEN}write coroutine stacks to {params.filepath} successfully!{COLOR_END}"
+                show_success_info(
+                    f"Write coroutine stacks to {params.filepath} successfully!"
                 )
         finally:
             client.close()
@@ -122,8 +121,8 @@ def do_action(self, cmd):
                             if line:
                                 line = line.decode("utf-8")
                                 f.write(line + "\n")
-                    print(
-                        f"{COLOR_GREEN}write stack to {file_name} successfully!{COLOR_END}"
+                    show_success_info(
+                        f"Write stack to {file_name} successfully!"
                     )
                 else:
                     for line in client.request_stream(body):
diff --git a/flight_profiler/plugins/trace/cli_plugin_trace.py b/flight_profiler/plugins/trace/cli_plugin_trace.py
@@ -55,8 +55,8 @@ def do_action(self, cmd):
                 else:
                     wrap: Union[WrapTraceFrame, str] = pickle.loads(content)
                     if type(wrap) == str:
-                        # error
-                        show_error_info(wrap)
+                        # String message (e.g., spy command hint)
+                        print(wrap)
                         continue
                     if (
                         len(wrap.frames) > 0
diff --git a/flight_profiler/plugins/trace/server_plugin_trace.py b/flight_profiler/plugins/trace/server_plugin_trace.py
@@ -5,6 +5,7 @@
 from flight_profiler.plugins.trace.trace_agent import TracePoint, global_trace_agent
 from flight_profiler.plugins.trace.trace_parser import TraceArgumentParser
 from flight_profiler.utils.args_util import split_regex
+from flight_profiler.utils.render_util import build_error_message
 
 
 class TraceServerPlugin(ServerPlugin):
@@ -24,7 +25,7 @@ async def do_action(self, param):
                 global_trace_agent.set_point(point)
                 # will not return end message, server request will block
             except:
-                await self.out_q.output_msg(Message(True, pickle.dumps(traceback.format_exc())))
+                await self.out_q.output_msg(Message(True, pickle.dumps(build_error_message(traceback.format_exc()))))
         elif splits[0] == "off":
             new_param = param[len(splits[0]) :]
             try:
@@ -33,9 +34,9 @@ async def do_action(self, param):
                 global_trace_agent.clear_point(point)
                 await self.out_q.output_msg(Message(True, None))
             except:
-                await self.out_q.output_msg(Message(True, pickle.dumps(traceback.format_exc())))
+                await self.out_q.output_msg(Message(True, pickle.dumps(build_error_message(traceback.format_exc()))))
         else:
-            await self.out_q.output_msg(Message(True, pickle.dumps("trace param is illegal.")))
+            await self.out_q.output_msg(Message(True, pickle.dumps(build_error_message("trace param is illegal."))))
 
 
 def get_instance(cmd: str, out_q: ServerQueue):
diff --git a/flight_profiler/plugins/trace/trace_render.py b/flight_profiler/plugins/trace/trace_render.py
@@ -8,6 +8,8 @@
 )
 from flight_profiler.utils.frame_util import global_filepath_operator
 from flight_profiler.utils.render_util import (
+    BOX_HORIZONTAL,
+    CMD_ICON_TRACE,
     COLOR_AWAIT,
     COLOR_BRIGHT_GREEN,
     COLOR_END,
@@ -76,9 +78,14 @@ def display(self, wrap: WrapTraceFrame) -> str:
         concat full frame stack
         """
         try:
+            cost_ms = wrap.frames[0].cost_ns / 1000000
             title: str = (
-                f"{COLOR_WHITE_255}{time_ns_to_formatted_string(wrap.frames[0].start_ns)};thread_name={wrap.thread_name}"
-                f";thread_id={wrap.thread_id};is_daemon={wrap.is_daemon};cost={wrap.frames[0].cost_ns / 1000000}ms{COLOR_END}\n"
+                f"{COLOR_FAINT}{BOX_HORIZONTAL * 60}{COLOR_END}\n"
+                f"{CMD_ICON_TRACE} {COLOR_WHITE_255}{time_ns_to_formatted_string(wrap.frames[0].start_ns)}{COLOR_END} "
+                f"{COLOR_FAINT}thread={COLOR_END}{wrap.thread_name} "
+                f"{COLOR_FAINT}tid={COLOR_END}{wrap.thread_id} "
+                f"{COLOR_FAINT}daemon={COLOR_END}{wrap.is_daemon} "
+                f"{COLOR_FAINT}cost={COLOR_END}{COLOR_WHITE_255}{cost_ms:.3f}ms{COLOR_END}\n"
             )
             frame: FlattenTreeTraceFrame = self.preprocess_frame(
                 build_frame_stack(wrap.frames)
diff --git a/flight_profiler/plugins/tt/time_tunnel_render.py b/flight_profiler/plugins/tt/time_tunnel_render.py
@@ -7,7 +7,10 @@
     FullInvocationRecord,
 )
 from flight_profiler.utils.render_util import (
+    BOX_HORIZONTAL,
+    COLOR_BOLD,
     COLOR_END,
+    COLOR_FAINT,
     COLOR_ORANGE,
     COLOR_WHITE_255,
     align_json_lines,
@@ -74,11 +77,12 @@ def render_records_list(self, list_records: bytes):
             self.__print_base_record(cli_base_record)
 
     def __print_header(self):
+        terminal_width = shutil.get_terminal_size().columns
         print(
-            f' {"INDEX".ljust(9)}{"TIMESTAMP".ljust(25)}{"COST(ms)".ljust(10)}{"IS-RET".ljust(8)}'
-            f'{"IS-EXP".ljust(8)}{"MODULE".ljust(30)}METHOD'
+            f'{COLOR_BOLD}{COLOR_WHITE_255} {"INDEX":<9}{"TIMESTAMP":<25}{"COST(ms)":<10}{"IS-RET":<8}'
+            f'{"IS-EXP":<8}{"MODULE":<30}METHOD{COLOR_END}'
         )
-        print("-" * shutil.get_terminal_size().columns)
+        print(f"{COLOR_FAINT}{BOX_HORIZONTAL * terminal_width}{COLOR_END}")
 
     def __print_base_record(self, record: BaseInvocationRecord):
         cost_ms: str = f"{record.cost_ms:.3f}"
diff --git a/flight_profiler/plugins/vmtool/server_plugin_vmtool.py b/flight_profiler/plugins/vmtool/server_plugin_vmtool.py
@@ -7,6 +7,7 @@
     VmtoolArgumentParser,
     VmtoolParams,
 )
+from flight_profiler.utils.render_util import build_error_message
 
 
 class VmtoolServerPlugin(ServerPlugin):
@@ -21,7 +22,7 @@ async def do_action(self, param):
                 Message(True, pickle.dumps(GLOBAL_VMTOOL_AGENT.do_action(vmtool_param)))
             )
         except:
-            await self.out_q.output_msg(Message(True, pickle.dumps(traceback.format_exc())))
+            await self.out_q.output_msg(Message(True, pickle.dumps(build_error_message(traceback.format_exc()))))
 
 
 def get_instance(cmd: str, out_q: ServerQueue):
diff --git a/flight_profiler/plugins/watch/watch_render.py b/flight_profiler/plugins/watch/watch_render.py
@@ -1,10 +1,14 @@
 from flight_profiler.plugins.watch.watch_displayer import WatchResult
 from flight_profiler.utils.render_util import (
+    BOX_HORIZONTAL,
     COLOR_BOLD,
     COLOR_END,
+    COLOR_FAINT,
     COLOR_GREEN,
     COLOR_RED,
     COLOR_WHITE_255,
+    ICON_FAILED,
+    ICON_SUCCESS,
     align_json_lines,
     align_prefix,
 )
@@ -59,8 +63,14 @@ def show_watch_result(self, result: WatchResult, output_raw: bool = False):
 
     def __build_title(self, result: WatchResult):
         formated_cost = "{:.6f}".format(result.cost_ms)
+        status_icon = ICON_FAILED if result.is_exp else ICON_SUCCESS
+        status_color = COLOR_RED if result.is_exp else COLOR_GREEN
         return (
-            f"{COLOR_WHITE_255}{time_ms_to_formatted_string(result.start_time)} method={result.method_identifier}"
-            f" cost={formated_cost}ms is_exp={COLOR_BOLD}{COLOR_RED if result.is_exp else COLOR_GREEN}{result.is_exp}{COLOR_END}{COLOR_WHITE_255}"
-            f" result={{{COLOR_END}\n"
+            f"{COLOR_FAINT}{BOX_HORIZONTAL * 60}{COLOR_END}\n"
+            f"{status_color}{status_icon}{COLOR_END} "
+            f"{COLOR_WHITE_255}{time_ms_to_formatted_string(result.start_time)} "
+            f"{COLOR_FAINT}method={COLOR_END}{result.method_identifier} "
+            f"{COLOR_FAINT}cost={COLOR_END}{formated_cost}ms "
+            f"{COLOR_FAINT}is_exp={COLOR_END}{COLOR_BOLD}{status_color}{result.is_exp}{COLOR_END}"
+            f"{COLOR_WHITE_255} result={{{COLOR_END}\n"
         )
diff --git a/flight_profiler/test/plugins/stack/stack_plugin_test.py b/flight_profiler/test/plugins/stack/stack_plugin_test.py
@@ -60,7 +60,7 @@ def test_stack_filepath(self):
                 print(output)
                 if output:
                     line = str(output)
-                    if line.find(f"write stack to {stack_file} successfully!") >= 0:
+                    if line.find(f"Write stack to {stack_file} successfully!") >= 0:
                         find = True
                         break
                 else:
diff --git a/flight_profiler/test/plugins/trace/trace_plugin_test.py b/flight_profiler/test/plugins/trace/trace_plugin_test.py
diff --git a/flight_profiler/test/plugins/trace/trace_render_test.py b/flight_profiler/test/plugins/trace/trace_render_test.py
diff --git a/flight_profiler/test/util/aop_decorator_test.py b/flight_profiler/test/util/aop_decorator_test.py
diff --git a/flight_profiler/utils/cli_util.py b/flight_profiler/utils/cli_util.py
diff --git a/flight_profiler/utils/render_util.py b/flight_profiler/utils/render_util.py

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`GetGlobalParser,`
`8`	`8`	`)`
`9`	`9`	`from flight_profiler.plugins.server_plugin import Message, ServerPlugin, ServerQueue`
	`10`	`+from flight_profiler.utils.render_util import build_error_message`
`10`	`11`
`11`	`12`
`12`	`13`	`class GetGlobalServerPlugin(ServerPlugin):`
`@@ -27,7 +28,7 @@ async def do_action(self, param):`
`27`	`28`	`)`
`28`	`29`	`except:`
`29`	`30`	`self.out_q.output_msg_nowait(`
`30`		`- Message(True, pickle.dumps(traceback.format_exc()))`
	`31`	`+ Message(True, pickle.dumps(build_error_message(traceback.format_exc())))`
`31`	`32`	`)`
`32`	`33`
`33`	`34`