From f52cc30f230f028afd22854ea60591ad5bc38d23 Mon Sep 17 00:00:00 2001 From: LHesperus <2639350497@qq.com> Date: Tue, 6 Aug 2024 15:13:48 +0800 Subject: [PATCH] adapt for 4.19 kernel (cherry picked from commit bc513f2b237cbfcc6021f6772af7fa93b4918a95) --- 0005-adapt-for-4.19-kernel.patch | 24 ++++++++++++++++++++++++ oeAware-collector.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0005-adapt-for-4.19-kernel.patch diff --git a/0005-adapt-for-4.19-kernel.patch b/0005-adapt-for-4.19-kernel.patch new file mode 100644 index 0000000..df2b4ca --- /dev/null +++ b/0005-adapt-for-4.19-kernel.patch @@ -0,0 +1,24 @@ +From 6c15574bb42decac738b54813b79a0f0fd138998 Mon Sep 17 00:00:00 2001 +From: LHesperus <2639350497@qq.com> +Date: Tue, 6 Aug 2024 11:05:25 +0800 +Subject: [PATCH] adapt for 4.19 kernel + +--- + thread_collector/thread_collector.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/thread_collector/thread_collector.cpp b/thread_collector/thread_collector.cpp +index cb99bba..7c6f36f 100644 +--- a/thread_collector/thread_collector.cpp ++++ b/thread_collector/thread_collector.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + char thread_name[] = "thread_collector"; + const int CYCLE_SIZE = 500; +-- +2.45.2.windows.1 + diff --git a/oeAware-collector.spec b/oeAware-collector.spec index 22cb68f..7fd2d91 100644 --- a/oeAware-collector.spec +++ b/oeAware-collector.spec @@ -1,6 +1,6 @@ Name: oeAware-collector Version: v1.0.2 -Release: 9 +Release: 10 Summary: %{name} provides low-overhead metrics collection capabilities, including microarchitecture, system, and kernel information. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -9,6 +9,7 @@ Patch1: 0001-add-netif_rx-counting-pmu-instance.patch Patch2: 0002-reduce-thread-collector-load.patch Patch3: 0003-fix-uninitialized-PmuAttr-attr.patch Patch4: 0004-fix-out-of-bounds-array.patch +Patch5: 0005-adapt-for-4.19-kernel.patch %global libkperf_name libkperf %global libkperf_tagver v1.0.4 @@ -85,6 +86,9 @@ install -b -m740 ./thread_collector/build/libthread_collector.so ${RPM_BUIL %attr(0440, root, root) %{_libdir}/oeAware-plugin/libthread_collector.so %changelog +* Tue Aug 6 2024 liuchanggeng - v1.0.2-10 +- adapt for 4.19 kernel + * Tue Jul 16 2024 fly_1997 - v1.0.2-9 - fix pmu cmake build option error -- Gitee