From cdd3fc9ff67ba5d66647f191b0b1a985756dbc49 Mon Sep 17 00:00:00 2001 From: zhangzhuozhou Date: Fri, 11 Apr 2025 09:31:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E5=86=85=E6=A0=B8pr?= =?UTF-8?q?oto=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzhuozhou --- .../plugins/ftrace_data/default/cgroup.proto | 21 ++++++------- .../plugins/ftrace_data/default/ext4.proto | 12 ++++++++ .../ftrace_data/default/filelock.proto | 18 +++++++---- .../plugins/ftrace_data/default/filemap.proto | 2 ++ .../plugins/ftrace_data/default/kmem.proto | 11 +++++-- .../plugins/ftrace_data/default/pagemap.proto | 4 ++- .../plugins/ftrace_data/default/sched.proto | 6 ++++ .../plugins/ftrace_data/default/sunrpc.proto | 23 +++++++++++++- .../plugins/ftrace_data/default/timer.proto | 3 ++ .../default/trace_plugin_result.proto | 1 + .../plugins/ftrace_data/default/vmscan.proto | 9 ++++-- .../ftrace_data/default/workqueue.proto | 6 ++-- .../ftrace_data/default/writeback.proto | 30 +++++++++---------- 13 files changed, 105 insertions(+), 41 deletions(-) diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto index ca5abbecb..0fc84feb8 100644 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/cgroup.proto @@ -21,7 +21,7 @@ option optimize_for = LITE_RUNTIME; // /sys/kernel/debug/tracing/events/cgroup/cgroup_attach_task/format message CgroupAttachTaskFormat { int32 dst_root = 1; - int32 dst_id = 2; + uint64 dst_id = 2; int32 dst_level = 3; int32 pid = 4; string dst_path = 5; @@ -38,7 +38,7 @@ message CgroupDestroyRootFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_freeze/format message CgroupFreezeFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } @@ -46,7 +46,7 @@ message CgroupFreezeFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_mkdir/format message CgroupMkdirFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } @@ -54,7 +54,7 @@ message CgroupMkdirFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_notify_frozen/format message CgroupNotifyFrozenFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; int32 val = 5; @@ -63,7 +63,7 @@ message CgroupNotifyFrozenFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_notify_populated/format message CgroupNotifyPopulatedFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; int32 val = 5; @@ -72,7 +72,7 @@ message CgroupNotifyPopulatedFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_release/format message CgroupReleaseFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } @@ -87,7 +87,7 @@ message CgroupRemountFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_rename/format message CgroupRenameFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } @@ -95,7 +95,7 @@ message CgroupRenameFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_rmdir/format message CgroupRmdirFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } @@ -110,7 +110,7 @@ message CgroupSetupRootFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_transfer_tasks/format message CgroupTransferTasksFormat { int32 dst_root = 1; - int32 dst_id = 2; + uint64 dst_id = 2; int32 dst_level = 3; int32 pid = 4; string dst_path = 5; @@ -120,7 +120,8 @@ message CgroupTransferTasksFormat { // /sys/kernel/debug/tracing/events/cgroup/cgroup_unfreeze/format message CgroupUnfreezeFormat { int32 root = 1; - int32 id = 2; + uint64 id = 2; int32 level = 3; string path = 4; } + diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto index bcbfdc9c5..e1a2efd79 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/ext4.proto @@ -159,6 +159,8 @@ message Ext4DiscardBlocksFormat { message Ext4DiscardPreallocationsFormat { uint64 dev = 1; uint64 ino = 2; + uint32 len = 3; + uint32 needed = 4; } // /sys/kernel/debug/tracing/events/ext4/ext4_drop_inode/format @@ -369,6 +371,9 @@ message Ext4ExtRemoveSpaceDoneFormat { int32 depth = 5; uint64 partial = 6; uint32 eh_entries = 7; + uint64 pc_pclu = 8; + uint32 pc_lblk = 9; + int32 pc_state = 10; } // /sys/kernel/debug/tracing/events/ext4/ext4_ext_rm_idx/format @@ -387,6 +392,9 @@ message Ext4ExtRmLeafFormat { uint32 ee_lblk = 5; uint64 ee_pblk = 6; int32 ee_len = 7; + uint64 pc_pclu = 8; + uint32 pc_lblk = 9; + int32 pc_state = 10; } // /sys/kernel/debug/tracing/events/ext4/ext4_ext_show_extent/format @@ -694,6 +702,7 @@ message Ext4PunchHoleFormat { message Ext4ReadBlockBitmapLoadFormat { uint64 dev = 1; uint32 group = 2; + uint32 prefetch = 3; } // /sys/kernel/debug/tracing/events/ext4/ext4_readpage/format @@ -720,6 +729,9 @@ message Ext4RemoveBlocksFormat { uint64 ee_pblk = 6; uint32 ee_lblk = 7; uint32 ee_len = 8; + uint64 pc_pclu = 9; + uint32 pc_lblk = 10; + int32 pc_state = 11; } // /sys/kernel/debug/tracing/events/ext4/ext4_request_blocks/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto index 897c281e3..6a2386e9b 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filelock.proto @@ -24,11 +24,12 @@ message BreakLeaseBlockFormat { uint64 i_ino = 2; uint64 s_dev = 3; uint64 fl_next = 4; - uint32 fl_owner = 5; + uint64 fl_owner = 5; uint32 fl_flags = 6; uint32 fl_type = 7; uint64 fl_break_time = 8; uint64 fl_downgrade_time = 9; + uint64 fl_blocker = 10; } // /sys/kernel/debug/tracing/events/filelock/break_lease_noblock/format @@ -37,11 +38,12 @@ message BreakLeaseNoblockFormat { uint64 i_ino = 2; uint64 s_dev = 3; uint64 fl_next = 4; - uint32 fl_owner = 5; + uint64 fl_owner = 5; uint32 fl_flags = 6; uint32 fl_type = 7; uint64 fl_break_time = 8; uint64 fl_downgrade_time = 9; + uint64 fl_blocker = 10; } // /sys/kernel/debug/tracing/events/filelock/break_lease_unblock/format @@ -50,11 +52,12 @@ message BreakLeaseUnblockFormat { uint64 i_ino = 2; uint64 s_dev = 3; uint64 fl_next = 4; - uint32 fl_owner = 5; + uint64 fl_owner = 5; uint32 fl_flags = 6; uint32 fl_type = 7; uint64 fl_break_time = 8; uint64 fl_downgrade_time = 9; + uint64 fl_blocker = 10; } // /sys/kernel/debug/tracing/events/filelock/generic_add_lease/format @@ -64,9 +67,10 @@ message GenericAddLeaseFormat { int32 dcount = 3; int32 icount = 4; uint64 s_dev = 5; - uint32 fl_owner = 6; + uint64 fl_owner = 6; uint32 fl_flags = 7; uint32 fl_type = 8; + int32 rcount = 9; } // /sys/kernel/debug/tracing/events/filelock/generic_delete_lease/format @@ -75,11 +79,12 @@ message GenericDeleteLeaseFormat { uint64 i_ino = 2; uint64 s_dev = 3; uint64 fl_next = 4; - uint32 fl_owner = 5; + uint64 fl_owner = 5; uint32 fl_flags = 6; uint32 fl_type = 7; uint64 fl_break_time = 8; uint64 fl_downgrade_time = 9; + uint64 fl_blocker = 10; } // /sys/kernel/debug/tracing/events/filelock/time_out_leases/format @@ -88,10 +93,11 @@ message TimeOutLeasesFormat { uint64 i_ino = 2; uint64 s_dev = 3; uint64 fl_next = 4; - uint32 fl_owner = 5; + uint64 fl_owner = 5; uint32 fl_flags = 6; uint32 fl_type = 7; uint64 fl_break_time = 8; uint64 fl_downgrade_time = 9; + uint64 fl_blocker = 10; } diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto index 057a56e6c..0ccd69921 100644 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/filemap.proto @@ -40,6 +40,7 @@ message MmFilemapAddToPageCacheFormat { uint64 i_ino = 2; uint64 index = 3; uint64 s_dev = 4; + uint32 order = 5; } // /sys/kernel/debug/tracing/events/filemap/mm_filemap_delete_from_page_cache/format @@ -48,5 +49,6 @@ message MmFilemapDeleteFromPageCacheFormat { uint64 i_ino = 2; uint64 index = 3; uint64 s_dev = 4; + uint32 order = 5; } diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto index 62efae3d8..b028015aa 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/kmem.proto @@ -30,7 +30,8 @@ message KmallocFormat { uint64 ptr = 2; uint64 bytes_req = 3; uint64 bytes_alloc = 4; - uint32 gfp_flags = 5; + uint64 gfp_flags = 5; + int32 node = 6; } // /sys/kernel/debug/tracing/events/kmem/kmalloc_node/format @@ -49,7 +50,9 @@ message KmemCacheAllocFormat { uint64 ptr = 2; uint64 bytes_req = 3; uint64 bytes_alloc = 4; - uint32 gfp_flags = 5; + uint64 gfp_flags = 5; + int32 node = 6; + uint32 accounted = 7; } // /sys/kernel/debug/tracing/events/kmem/kmem_cache_alloc_node/format @@ -66,13 +69,14 @@ message KmemCacheAllocNodeFormat { message KmemCacheFreeFormat { uint64 call_site = 1; uint64 ptr = 2; + string name = 3; } // /sys/kernel/debug/tracing/events/kmem/mm_page_alloc/format message MmPageAllocFormat { uint64 pfn = 1; uint32 order = 2; - uint32 gfp_flags = 3; + uint64 gfp_flags = 3; int32 migratetype = 4; } @@ -91,6 +95,7 @@ message MmPageAllocZoneLockedFormat { uint64 pfn = 1; uint32 order = 2; int32 migratetype = 3; + int32 percpu_refill = 4; } // /sys/kernel/debug/tracing/events/kmem/mm_page_free/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto index 05128f0f7..f359a1f8b 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/pagemap.proto @@ -22,13 +22,15 @@ option optimize_for = LITE_RUNTIME; message MmLruActivateFormat { uint64 page = 1; uint64 pfn = 2; + uint64 folio = 3; } // /sys/kernel/debug/tracing/events/pagemap/mm_lru_insertion/format message MmLruInsertionFormat { uint64 page = 1; uint64 pfn = 2; - int32 lru = 3; + uint32 lru = 3; uint64 flags = 4; + uint64 folio = 5; } diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto index 5d5f377af..38822742d 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sched.proto @@ -146,6 +146,12 @@ message SchedStickNumaFormat { int32 src_nid = 5; int32 dst_cpu = 6; int32 dst_nid = 7; + int32 src_pid = 8; + int32 src_tgid = 9; + int32 src_ngid = 10; + int32 dst_pid = 11; + int32 dst_tgid = 12; + int32 dst_ngid = 13; } // /sys/kernel/debug/tracing/events/sched/sched_swap_numa/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto index 964593fe9..62c6ceafb 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/sunrpc.proto @@ -46,6 +46,8 @@ message RpcSocketCloseFormat { uint64 ino = 3; string dstaddr = 4; string dstport = 5; + string saddr = 6; + string daddr = 7; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_connect/format @@ -56,6 +58,8 @@ message RpcSocketConnectFormat { uint64 ino = 4; string dstaddr = 5; string dstport = 6; + string saddr = 7; + string daddr = 8; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_error/format @@ -66,6 +70,8 @@ message RpcSocketErrorFormat { uint64 ino = 4; string dstaddr = 5; string dstport = 6; + string saddr = 7; + string daddr = 8; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_reset_connection/format @@ -76,6 +82,8 @@ message RpcSocketResetConnectionFormat { uint64 ino = 4; string dstaddr = 5; string dstport = 6; + string saddr = 7; + string daddr = 8; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_shutdown/format @@ -85,6 +93,8 @@ message RpcSocketShutdownFormat { uint64 ino = 3; string dstaddr = 4; string dstport = 5; + string saddr = 6; + string daddr = 7; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_socket_state_change/format @@ -94,6 +104,8 @@ message RpcSocketStateChangeFormat { uint64 ino = 3; string dstaddr = 4; string dstport = 5; + string saddr = 6; + string daddr = 7; } // /sys/kernel/debug/tracing/events/sunrpc/rpc_task_begin/format @@ -163,6 +175,7 @@ message SvcProcessFormat { uint32 proc = 3; string service = 4; string addr = 5; + string procedure = 6; } // /sys/kernel/debug/tracing/events/sunrpc/svc_recv/format @@ -179,6 +192,9 @@ message SvcSendFormat { int32 status = 2; uint64 flags = 3; string addr = 4; + uint32 server = 5; + uint32 client = 6; + uint32 netns_ino = 7; } // /sys/kernel/debug/tracing/events/sunrpc/svc_wake_up/format @@ -192,8 +208,10 @@ message SvcXprtDequeueFormat { uint64 flags = 2; uint64 wakeup = 3; string addr = 4; + uint32 server = 5; + uint32 client = 6; + uint32 netns_ino = 7; } - // /sys/kernel/debug/tracing/events/sunrpc/svc_xprt_do_enqueue/format message SvcXprtDoEnqueueFormat { uint64 xprt = 1; @@ -224,6 +242,9 @@ message XprtTransmitFormat { int32 status = 2; string addr = 3; string port = 4; + uint32 task_id = 5; + uint32 client_id = 6; + uint32 seqno = 7; } // /sys/kernel/debug/tracing/events/sunrpc/xs_tcp_data_ready/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto index 1d0c219cf..3f5c2a855 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/timer.proto @@ -66,6 +66,8 @@ message ItimerStateFormat { uint64 value_usec = 4; uint64 interval_sec = 5; uint64 interval_usec = 6; + uint64 value_nsec = 7; + uint64 interval_nsec = 8; } // /sys/kernel/debug/tracing/events/timer/timer_cancel/format @@ -78,6 +80,7 @@ message TimerExpireEntryFormat { uint64 timer = 1; uint64 now = 2; uint64 function = 3; + uint64 baseclk = 4; } // /sys/kernel/debug/tracing/events/timer/timer_expire_exit/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto index 2e28ce6cd..6b1ac1a1a 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/trace_plugin_result.proto @@ -22,6 +22,7 @@ message TracePluginResult { repeated FtraceCpuDetailMsg ftrace_cpu_detail = 2; repeated SymbolsDetailMsg symbols_detail = 5; repeated ClockDetailMsg clocks_detail = 6; + string version = 7; } message ClockDetailMsg { diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto index 25e7e1d95..2c88a6e7b 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/vmscan.proto @@ -35,7 +35,7 @@ message MmShrinkSlabStartFormat { uint64 shrink = 2; int32 nid = 3; uint64 nr_objects_to_shrink = 4; - uint32 gfp_flags = 5; + uint64 gfp_flags = 5; uint64 cache_items = 6; uint64 delta = 7; uint64 total_scan = 8; @@ -46,7 +46,7 @@ message MmShrinkSlabStartFormat { message MmVmscanDirectReclaimBeginFormat { int32 order = 1; int32 may_writepage = 2; - uint32 gfp_flags = 3; + uint64 gfp_flags = 3; int32 classzone_idx = 4; } @@ -77,6 +77,7 @@ message MmVmscanLruIsolateFormat { uint64 nr_taken = 6; uint32 isolate_mode = 7; int32 lru = 8; + int32 highest_zoneidx = 9; } // /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_lru_shrink_inactive/format @@ -93,6 +94,8 @@ message MmVmscanLruShrinkInactiveFormat { uint64 nr_unmap_fail = 10; int32 priority = 11; int32 reclaim_flags = 12; + uint32 nr_activate0 = 13; + uint32 nr_activate1 = 14; } // /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_wakeup_kswapd/format @@ -100,7 +103,7 @@ message MmVmscanWakeupKswapdFormat { int32 nid = 1; int32 zid = 2; int32 order = 3; - uint32 gfp_flags = 4; + uint64 gfp_flags = 4; } // /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_writepage/format diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto index 647589798..8518e837f 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/workqueue.proto @@ -26,6 +26,7 @@ message WorkqueueActivateWorkFormat { // /sys/kernel/debug/tracing/events/workqueue/workqueue_execute_end/format message WorkqueueExecuteEndFormat { uint64 work = 1; + uint64 function = 2; } // /sys/kernel/debug/tracing/events/workqueue/workqueue_execute_start/format @@ -39,7 +40,8 @@ message WorkqueueQueueWorkFormat { uint64 work = 1; uint64 function = 2; uint64 workqueue = 3; - uint32 req_cpu = 4; - uint32 cpu = 5; + int32 req_cpu = 4; + int32 cpu = 5; + string workqueue_new = 6; } diff --git a/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto b/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto index ae92c907a..6abf016c0 100755 --- a/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto +++ b/trace_streamer/src/protos/types/plugins/ftrace_data/default/writeback.proto @@ -34,7 +34,7 @@ message BalanceDirtyPagesFormat { uint64 pause = 12; uint64 period = 13; uint64 think = 14; - uint32 cgroup_ino = 15; + uint64 cgroup_ino = 15; } // /sys/kernel/debug/tracing/events/writeback/bdi_dirty_ratelimit/format @@ -46,7 +46,7 @@ message BdiDirtyRatelimitFormat { uint64 dirty_ratelimit = 5; uint64 task_ratelimit = 6; uint64 balanced_dirty_ratelimit = 7; - uint32 cgroup_ino = 8; + uint64 cgroup_ino = 8; } // /sys/kernel/debug/tracing/events/writeback/global_dirty_state/format @@ -73,7 +73,7 @@ message WbcWritepageFormat { int32 range_cyclic = 8; uint64 range_start = 9; uint64 range_end = 10; - uint32 cgroup_ino = 11; + uint64 cgroup_ino = 11; } // /sys/kernel/debug/tracing/events/writeback/writeback_bdi_register/format @@ -129,7 +129,7 @@ message WritebackExecFormat { int32 range_cyclic = 6; int32 for_background = 7; int32 reason = 8; - uint32 cgroup_ino = 9; + uint64 cgroup_ino = 9; } // /sys/kernel/debug/tracing/events/writeback/writeback_lazytime/format @@ -173,7 +173,7 @@ message WritebackQueueFormat { int32 range_cyclic = 6; int32 for_background = 7; int32 reason = 8; - uint32 cgroup_ino = 9; + uint64 cgroup_ino = 9; } // /sys/kernel/debug/tracing/events/writeback/writeback_queue_io/format @@ -183,7 +183,7 @@ message WritebackQueueIoFormat { uint64 age = 3; int32 moved = 4; int32 reason = 5; - uint32 cgroup_ino = 6; + uint64 cgroup_ino = 6; } // /sys/kernel/debug/tracing/events/writeback/writeback_sb_inodes_requeue/format @@ -192,7 +192,7 @@ message WritebackSbInodesRequeueFormat { uint64 ino = 2; uint64 state = 3; uint64 dirtied_when = 4; - uint32 cgroup_ino = 5; + uint64 cgroup_ino = 5; } // /sys/kernel/debug/tracing/events/writeback/writeback_single_inode/format @@ -204,7 +204,7 @@ message WritebackSingleInodeFormat { uint64 writeback_index = 5; uint64 nr_to_write = 6; uint64 wrote = 7; - uint32 cgroup_ino = 8; + uint64 cgroup_ino = 8; } // /sys/kernel/debug/tracing/events/writeback/writeback_single_inode_start/format @@ -216,7 +216,7 @@ message WritebackSingleInodeStartFormat { uint64 writeback_index = 5; uint64 nr_to_write = 6; uint64 wrote = 7; - uint32 cgroup_ino = 8; + uint64 cgroup_ino = 8; } // /sys/kernel/debug/tracing/events/writeback/writeback_start/format @@ -229,7 +229,7 @@ message WritebackStartFormat { int32 range_cyclic = 6; int32 for_background = 7; int32 reason = 8; - uint32 cgroup_ino = 9; + uint64 cgroup_ino = 9; } // /sys/kernel/debug/tracing/events/writeback/writeback_wait/format @@ -242,7 +242,7 @@ message WritebackWaitFormat { int32 range_cyclic = 6; int32 for_background = 7; int32 reason = 8; - uint32 cgroup_ino = 9; + uint64 cgroup_ino = 9; } // /sys/kernel/debug/tracing/events/writeback/writeback_wait_iff_congested/format @@ -254,7 +254,7 @@ message WritebackWaitIffCongestedFormat { // /sys/kernel/debug/tracing/events/writeback/writeback_wake_background/format message WritebackWakeBackgroundFormat { string name = 1; - uint32 cgroup_ino = 2; + uint64 cgroup_ino = 2; } // /sys/kernel/debug/tracing/events/writeback/writeback_write_inode/format @@ -262,7 +262,7 @@ message WritebackWriteInodeFormat { string name = 1; uint64 ino = 2; int32 sync_mode = 3; - uint32 cgroup_ino = 4; + uint64 cgroup_ino = 4; } // /sys/kernel/debug/tracing/events/writeback/writeback_write_inode_start/format @@ -270,7 +270,7 @@ message WritebackWriteInodeStartFormat { string name = 1; uint64 ino = 2; int32 sync_mode = 3; - uint32 cgroup_ino = 4; + uint64 cgroup_ino = 4; } // /sys/kernel/debug/tracing/events/writeback/writeback_written/format @@ -283,6 +283,6 @@ message WritebackWrittenFormat { int32 range_cyclic = 6; int32 for_background = 7; int32 reason = 8; - uint32 cgroup_ino = 9; + uint64 cgroup_ino = 9; } -- Gitee From 16c306071d618c6c8942cc2a2582e232a7f803ac Mon Sep 17 00:00:00 2001 From: wangyujie Date: Sat, 12 Apr 2025 09:01:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dactual=20timeline?= =?UTF-8?q?=E6=B3=B3=E9=81=93=E6=94=B6=E8=97=8F=E5=90=8E=EF=BC=8C=E6=A1=86?= =?UTF-8?q?=E9=80=89tab=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyujie --- ide/src/trace/bean/BoxSelection.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ide/src/trace/bean/BoxSelection.ts b/ide/src/trace/bean/BoxSelection.ts index 76ec3d2f4..c83bb3455 100644 --- a/ide/src/trace/bean/BoxSelection.ts +++ b/ide/src/trace/bean/BoxSelection.ts @@ -677,7 +677,7 @@ export class SelectionParam { Math.max(filterJank.ts! + filterJank.dur!, rangeData!.endNS || 0) - Math.min(filterJank.ts!, rangeData!.startNS || 0) < filterJank.dur! + (rangeData!.endNS || 0) - (rangeData!.startNS || 0); - if (it.name === 'Actual Timeline') { + if (it.name.startsWith('Actual Timeline')) { if (it.rowParentId === 'frameTime') { it.dataListCache.forEach((jankData: unknown) => { // @ts-ignore @@ -691,7 +691,7 @@ export class SelectionParam { } else if (it.folder) { this.jankFramesData = []; it.childrenList.forEach((child) => { - if (child.rowType === TraceRow.ROW_TYPE_JANK && child.name === 'Actual Timeline') { + if (child.rowType === TraceRow.ROW_TYPE_JANK && child.name.startsWith('Actual Timeline')) { if (child.rowParentId === 'frameTime') { child.dataListCache.forEach((jankData: unknown) => { // @ts-ignore -- Gitee From 312ec868b7a3a03aa6ccdd1f16cc8dcf0aa6817a Mon Sep 17 00:00:00 2001 From: wangyujie Date: Sat, 12 Apr 2025 09:11:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dhiperf=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=93=8D=E4=BD=9C=E9=BD=BF=E8=BD=AE=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=B6=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyujie --- ide/src/trace/component/SpSystemTrace.init.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ide/src/trace/component/SpSystemTrace.init.ts b/ide/src/trace/component/SpSystemTrace.init.ts index 2fba2fb67..69a4599be 100644 --- a/ide/src/trace/component/SpSystemTrace.init.ts +++ b/ide/src/trace/component/SpSystemTrace.init.ts @@ -462,6 +462,13 @@ function collectHandlerNo(sp: SpSystemTrace, currentRow: unknown, event: unknown // @ts-ignore `div[row-id='${traceId}${currentRow.rowId}-${currentRow.rowType}']` ); + //@ts-ignore + if (currentRow!.tampName.startsWith("CallChart")) { + // @ts-ignore + let index = currentRow!.name.indexOf(']') + 1; + // @ts-ignore + currentRow!.tampName = index !== -1 ? currentRow!.name.substring(0, index) : currentRow!.name; + } // 取消收藏时，删除父亲ID // @ts-ignore currentRow.name = currentRow.tampName; -- Gitee From a1d611869533d7b4577c15d66d4bd66f30848c35 Mon Sep 17 00:00:00 2001 From: danghongquan Date: Mon, 21 Apr 2025 17:23:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E7=BB=98=E5=88=B6VM?= =?UTF-8?q?=20Tracker=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: danghongquan --- ide/src/trace/component/chart/SpVmTrackerChart.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ide/src/trace/component/chart/SpVmTrackerChart.ts b/ide/src/trace/component/chart/SpVmTrackerChart.ts index da031c881..c6a4b9313 100644 --- a/ide/src/trace/component/chart/SpVmTrackerChart.ts +++ b/ide/src/trace/component/chart/SpVmTrackerChart.ts @@ -78,10 +78,6 @@ export class VmTrackerChart { } } } - const result = await querySmapsExits(); - if (result.length <= 0) { - return; - } await this.initVmTrackerFolder(); await this.initSMapsFolder(); const rowNameList: Array = ['Dirty', 'Swapped', 'RSS', 'PSS', 'USS']; -- Gitee From 53302600a486b23e0fdda4f3dbcfbb88a1018141 Mon Sep 17 00:00:00 2001 From: zhangzhuozhou Date: Tue, 22 Apr 2025 16:02:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:trace=5Fstreamer=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=B2=BE=E7=AE=80=E5=90=8E=E7=9A=84CPU,?= =?UTF-8?q?=E5=86=85=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzhuozhou --- .../pbreader_cpu_data_parser.cpp | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/trace_streamer/src/parser/pbreader_parser/cpu_data_parser/pbreader_cpu_data_parser.cpp b/trace_streamer/src/parser/pbreader_parser/cpu_data_parser/pbreader_cpu_data_parser.cpp index a941cc362..0e16e3041 100644 --- a/trace_streamer/src/parser/pbreader_parser/cpu_data_parser/pbreader_cpu_data_parser.cpp +++ b/trace_streamer/src/parser/pbreader_parser/cpu_data_parser/pbreader_cpu_data_parser.cpp @@ -31,21 +31,19 @@ PbreaderCpuDataParser::~PbreaderCpuDataParser() void PbreaderCpuDataParser::Parse(ProtoReader::BytesView tracePacket, uint64_t ts) { ProtoReader::CpuData_Reader cpuData(tracePacket.data_, tracePacket.size_); - if (!cpuData.has_cpu_usage_info() && !cpuData.has_thread_info()) { + if (!cpuData.has_cpu_usage_info()) { return; } - if (cpuData.has_cpu_usage_info()) { - auto userLoad = cpuData.user_load(); - auto sysLoad = cpuData.sys_load(); - auto process_num = cpuData.process_num(); - ts = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_CLOCK_REALTIME, ts); - UpdatePluginTimeRange(TS_CLOCK_REALTIME, ts, ts); - auto cpuUsage = std::make_unique(); - streamFilters_->statFilter_->IncreaseStat(TRACE_CPU_USAGE, STAT_EVENT_RECEIVED); - cpuUsage->SetCpuUsage(ts); - cpuUsage->SetExtInfo(cpuData.total_load(), userLoad, sysLoad, process_num); - cpuData_.push_back(std::move(cpuUsage)); - } + auto userLoad = cpuData.user_load(); + auto sysLoad = cpuData.sys_load(); + auto process_num = cpuData.process_num(); + ts = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_CLOCK_REALTIME, ts); + UpdatePluginTimeRange(TS_CLOCK_REALTIME, ts, ts); + auto cpuUsage = std::make_unique(); + streamFilters_->statFilter_->IncreaseStat(TRACE_CPU_USAGE, STAT_EVENT_RECEIVED); + cpuUsage->SetCpuUsage(ts); + cpuUsage->SetExtInfo(cpuData.total_load(), userLoad, sysLoad, process_num); + cpuData_.push_back(std::move(cpuUsage)); } void PbreaderCpuDataParser::Finish() { -- Gitee