0004-fix-out-of-bounds-array.patch

@@ -1,55 +0,0 @@
-From 341bd6e8292b96ff5cf02bbaeedf447df18778aa Mon Sep 17 00:00:00 2001
-From: fly_1997 <flylove7@outlook.com>
-Date: Mon, 15 Jul 2024 14:03:39 +0800
-Subject: [PATCH] fix out of bounds array
-
----
- thread_collector/thread_collector.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/thread_collector/thread_collector.cpp b/thread_collector/thread_collector.cpp
-index f1d9cc4..cb99bba 100644
---- a/thread_collector/thread_collector.cpp
-+++ b/thread_collector/thread_collector.cpp
-@@ -11,8 +11,10 @@
-  ******************************************************************************/
- #include "interface.h"
- #include "thread_info.h"
-+#include <iostream>
- #include <string>
- #include <vector>
-+#include <fstream>
- #include <unordered_map>
- #include <csignal>
- #include <dirent.h>
-@@ -20,7 +22,6 @@
- 
- char thread_name[] = "thread_collector";
- const int CYCLE_SIZE = 500;
--const int MAX_NAME_LENGTH = 20;
- static DataRingBuf ring_buf;
- static DataBuf data_buf;
- static ThreadInfo threads[THREAD_NUM];
-@@ -60,14 +61,13 @@ static void clear_invalid_tid(int &num) {
- 
- static ThreadInfo get_thread_info(int pid, int tid) {
-     std::string s_path = "/proc/" + std::to_string(pid) + "/task/" + std::to_string(tid) + "/comm";
--    FILE *s_file = fopen(s_path.c_str(), "r");
--    if (s_file == nullptr) {
-+    std::ifstream input_file(s_path); 
-+    if (!input_file) {
-         return ThreadInfo{};
-     }
--    char name[MAX_NAME_LENGTH];
--    fscanf(s_file, "%s", name);
--    fclose(s_file);
--    return ThreadInfo{pid, tid, std::string(name)};
-+    std::string name;
-+    input_file >> name;
-+    return ThreadInfo{pid, tid, name};
- }
- 
- static bool process_not_change(struct stat *task_stat, const std::string &task_path, int pid) {
--- 
-2.33.0
-

0005-adapt-for-4.19-kernel.patch

@@ -1,24 +0,0 @@
-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 <csignal>
- #include <dirent.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- char thread_name[] = "thread_collector";
- const int CYCLE_SIZE = 500;
--- 
-2.45.2.windows.1
-

oeAware-collector.spec

@@ -1,6 +1,6 @@
 Name:		oeAware-collector
 Version:	v1.0.2
-Release:	11
+Release:	6
 Summary:	%{name} provides low-overhead metrics collection capabilities, including microarchitecture, system, and kernel information.
 License:	MulanPSL2
 URL:		https://gitee.com/openeuler/%{name}
@@ -8,18 +8,15 @@ Source0:	%{name}-%{version}.tar.gz
 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.5
+%global libkperf_tagver v1.0.4
 %global libkperf_source https://gitee.com/openeuler/libkperf.git
 
 BuildRequires: cmake gcc-c++
 BuildRequires: numactl-devel
 BuildRequires: git
 BuildRequires: libboundscheck
-Requires:      libboundscheck
 Provides:      %{name}
 
 ExclusiveArch: aarch64 x86_64
@@ -56,7 +53,7 @@ mkdir build
 cd build
 cmake .. -DLIB_KPERF_LIBPATH=%{_builddir}/%{name}-%{version}/pmu/3rdlib/bin/ \
          -DLIB_KPERF_INCPATH=%{_builddir}/%{name}-%{version}/pmu/3rdlib/include/ \
-         -DCMAKE_SKIP_RPATH=TRUE -DWITH_DEBUG=TRUE
+         -DCMAKE_SKIP_RPATH=TRUE -WITH_DEBUG=TRUE
 make
 %endif
 
@@ -86,21 +83,6 @@ install -b -m740  ./thread_collector/build/libthread_collector.so     ${RPM_BUIL
 %attr(0440, root, root) %{_libdir}/oeAware-plugin/libthread_collector.so
 
 %changelog
-* Tue Sep 10 2024 liuchanggeng <liuchanggeng@huawei.com> - v1.0.2-11
-- update libkperf version to v1.0.5, to solve the perf cycles error
-
-* Tue Aug 6 2024 liuchanggeng <liuchanggeng@huawei.com> - v1.0.2-10
-- adapt for 4.19 kernel
-
-* Tue Jul 16 2024 fly_1997 <flylove7@outlook.com> - v1.0.2-9
-- fix pmu cmake build option error
-
-* Tue Jul 16 2024 Zhao Mengmeng <zhaomengmeng@kylinos.cn> - v1.0.2-8
-- explicit add libboundscheck as Requires
-
-* Mon Jul 15 2024 fly_1997 <flylove7@outlook.com> - v1.0.2-7
-- fix out of bounds array
-
 * Fri Jul 5 2024 zhoukaiqi <zhoukaiqi@huawei.com> - v1.0.2-6
 - fix uninitialized PmuAttr attr