81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
From 80257a974c20bb8c966e310aedb2aff3faaed94f Mon Sep 17 00:00:00 2001
|
||
From: rfwang07 <wangrufeng5@huawei.com>
|
||
Date: Sat, 7 Dec 2024 14:48:47 +0800
|
||
Subject: [PATCH] adapt include dir for oeaware
|
||
|
||
---
|
||
CMakeLists.txt | 4 ----
|
||
include/tuner.h | 4 ++--
|
||
src/oeaware_plugins/instance.cc | 2 +-
|
||
src/oeaware_plugins/tuner_sysboost.cc | 7 ++++---
|
||
4 files changed, 7 insertions(+), 10 deletions(-)
|
||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
index dda676e..0dd5c51 100644
|
||
--- a/CMakeLists.txt
|
||
+++ b/CMakeLists.txt
|
||
@@ -32,10 +32,6 @@ add_library(dfot SHARED ${dfot_tuner_sysboost_src})
|
||
|
||
include_directories(dfot PRIVATE
|
||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||
- # 因为oeAware头文件问题，此处临时适配
|
||
- /usr/include/libkperf
|
||
- /usr/include/oeaware
|
||
- /usr/include/oeaware/interface
|
||
)
|
||
|
||
target_link_libraries(dfot boundscheck kperf sym dl log4cplus boost_system boost_filesystem)
|
||
diff --git a/include/tuner.h b/include/tuner.h
|
||
index 46db4f7..b72cc3c 100644
|
||
--- a/include/tuner.h
|
||
+++ b/include/tuner.h
|
||
@@ -13,8 +13,8 @@
|
||
#define __TUNER_H__
|
||
|
||
#include <oeaware/data_list.h>
|
||
-#include <oeaware/interface/topic.h>
|
||
-#include <oeaware/interface/interface.h>
|
||
+#include <oeaware/topic.h>
|
||
+#include <oeaware/interface.h>
|
||
|
||
class SysboostTuner : public oeaware::Interface {
|
||
public:
|
||
diff --git a/src/oeaware_plugins/instance.cc b/src/oeaware_plugins/instance.cc
|
||
index b51c987..767b1aa 100644
|
||
--- a/src/oeaware_plugins/instance.cc
|
||
+++ b/src/oeaware_plugins/instance.cc
|
||
@@ -1,4 +1,4 @@
|
||
-#include <oeaware/interface/interface.h>
|
||
+#include <oeaware/interface.h>
|
||
|
||
#include "logs.h"
|
||
#include "tuner.h"
|
||
diff --git a/src/oeaware_plugins/tuner_sysboost.cc b/src/oeaware_plugins/tuner_sysboost.cc
|
||
index cfab1fc..0c99a5a 100644
|
||
--- a/src/oeaware_plugins/tuner_sysboost.cc
|
||
+++ b/src/oeaware_plugins/tuner_sysboost.cc
|
||
@@ -1,8 +1,9 @@
|
||
#include <cstring>
|
||
#include <securec.h>
|
||
|
||
-#include <oeaware/interface/interface.h>
|
||
-#include <oeaware/pmu_sampling_data.h>
|
||
+#include <oeaware/interface.h>
|
||
+#include <oeaware/data_list.h>
|
||
+#include <oeaware/data/pmu_sampling_data.h>
|
||
|
||
#include "logs.h"
|
||
#include "utils.h"
|
||
@@ -15,7 +16,7 @@
|
||
// 当前优化插件需要的采样数据来源于oeaware-manager采样实例pmu_sampling_collector
|
||
// 本插件通过订阅获取pmu_sampling_collector的采样数据，也可以预置profile来优化
|
||
// 注意如果oeaware-manager仓库对应采样实例名字有变化时，此处也要同步修改
|
||
-#define DEP_INSTANCE_NAME "pmu_sampling_collector"
|
||
+#define DEP_INSTANCE_NAME OE_PMU_SAMPLING_COLLECTOR
|
||
// 订阅性能事件
|
||
#define DEP_TOPIC_NAME "cycles"
|
||
// sysboost优化插件实例名
|
||
--
|
||
2.39.5 (Apple Git-154)
|
||
|