From f458ddd4f51cc1a24c7e6e0622864d4eeb37278c Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Tue, 21 Nov 2023 15:17:34 +0800
Subject: [PATCH 1/9] add gpu plugin

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/BUILD.gn                               |   2 +
 device/cmds/BUILD.gn                          |   1 +
 device/cmds/include/parse_plugin_config.h     |   1 +
 device/cmds/src/parse_plugin_config.cpp       |  19 ++
 device/cmds/test/BUILD.gn                     |   1 +
 device/ohos_test.xml                          |   6 +
 device/plugins/api/src/main.cpp               |   1 +
 device/plugins/gpu_plugin/BUILD.gn            |  75 +++++++
 .../gpu_plugin/include/gpu_data_plugin.h      |  71 +++++++
 .../gpu_plugin/src/gpu_data_plugin.cpp        | 168 +++++++++++++++
 device/plugins/gpu_plugin/src/gpu_module.cpp  |  66 ++++++
 device/plugins/gpu_plugin/src/test_main.cpp   |  70 +++++++
 device/plugins/gpu_plugin/test/BUILD.gn       |  57 +++++
 .../gpu_plugin/test/resources/gpustat1        |   1 +
 .../gpu_plugin/test/resources/gpustat2        |   1 +
 .../unittest/gpu_data_plugin_unittest.cpp     | 196 ++++++++++++++++++
 protos/types/plugins/gpu_data/BUILD.gn        | 130 ++++++++++++
 .../plugins/gpu_data/gpu_plugin_config.proto  |  24 +++
 .../plugins/gpu_data/gpu_plugin_result.proto  |  22 ++
 19 files changed, 912 insertions(+)
 create mode 100644 device/plugins/gpu_plugin/BUILD.gn
 create mode 100644 device/plugins/gpu_plugin/include/gpu_data_plugin.h
 create mode 100644 device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
 create mode 100644 device/plugins/gpu_plugin/src/gpu_module.cpp
 create mode 100644 device/plugins/gpu_plugin/src/test_main.cpp
 create mode 100644 device/plugins/gpu_plugin/test/BUILD.gn
 create mode 100644 device/plugins/gpu_plugin/test/resources/gpustat1
 create mode 100644 device/plugins/gpu_plugin/test/resources/gpustat2
 create mode 100644 device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
 create mode 100644 protos/types/plugins/gpu_data/BUILD.gn
 create mode 100644 protos/types/plugins/gpu_data/gpu_plugin_config.proto
 create mode 100644 protos/types/plugins/gpu_data/gpu_plugin_result.proto

diff --git a/device/BUILD.gn b/device/BUILD.gn
index 71bc6bcb7..15a7fccd9 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -20,6 +20,7 @@ group("hiprofiler_targets") {
       "plugins/api:hiprofiler_plugins",
       "plugins/arkts_plugin:arktsplugin",
       "plugins/cpu_plugin:cpudataplugin",
+      "plugins/gpu_plugin:gpudataplugin",
       "plugins/diskio_plugin:diskiodataplugin",
       "plugins/ftrace_plugin:ftrace_targets",
       "plugins/hidump_plugin:hidumpplugin",
@@ -61,6 +62,7 @@ group("unittest") {
     "plugins/api/test:unittest",
     "plugins/arkts_plugin/test:unittest",
     "plugins/cpu_plugin/test:unittest",
+    "plugins/gpu_plugin/test:unittest",
     "plugins/diskio_plugin/test:unittest",
     "plugins/ftrace_plugin/test:unittest",
     "plugins/hidump_plugin/test:unittest",
diff --git a/device/cmds/BUILD.gn b/device/cmds/BUILD.gn
index 6b8427106..d60d238fb 100644
--- a/device/cmds/BUILD.gn
+++ b/device/cmds/BUILD.gn
@@ -41,6 +41,7 @@ ohos_executable("hiprofiler_cmd") {
     "${OHOS_PROFILER_DIR}/protos/services:profiler_service_type_source",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/arkts_plugin:arkts_plugin_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/cpu_data:cpu_plugin_config_cpp_standard",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/diskio_data:diskio_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/ftrace_data/${device_kernel_version}:ftrace_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hidump_data:hidump_plugin_config_cpp_standard",
diff --git a/device/cmds/include/parse_plugin_config.h b/device/cmds/include/parse_plugin_config.h
index 6fe3a32bb..abd27abf8 100755
--- a/device/cmds/include/parse_plugin_config.h
+++ b/device/cmds/include/parse_plugin_config.h
@@ -44,6 +44,7 @@ public:
     bool SetSerializeHisyseventConfig(const std::string& pluginName, ProfilerPluginConfig& pluginConfig);
     bool SetSerializeArkTSConfig(const std::string& pluginName, ProfilerPluginConfig& pluginConfig);
     bool SetSerializeXpowerConfig(const std::string& pluginName, ProfilerPluginConfig& pluginConfig);
+    bool SetSerializeGpuConfig(const std::string& pluginName, ProfilerPluginConfig& pluginConfig);
 
     google::protobuf::TextFormat::Parser& GetParser()
     {
diff --git a/device/cmds/src/parse_plugin_config.cpp b/device/cmds/src/parse_plugin_config.cpp
index 4028668fc..0aeea6706 100755
--- a/device/cmds/src/parse_plugin_config.cpp
+++ b/device/cmds/src/parse_plugin_config.cpp
@@ -16,6 +16,7 @@
 #include "parse_plugin_config.h"
 
 #include "cpu_plugin_config_standard.pb.h"
+#include "gpu_plugin_config_standard.pb.h"
 #include "diskio_plugin_config_standard.pb.h"
 #include "hidump_plugin_config_standard.pb.h"
 #include "hiebpf_plugin_config_standard.pb.h"
@@ -129,6 +130,8 @@ bool ParsePluginConfig::SetSerializePluginsConfig(const std::string& pluginName,
         ret = SetSerializeArkTSConfig(pluginName, pluginConfig);
     } else if (pluginName == "xpower-plugin") {
         ret = SetSerializeXpowerConfig(pluginName, pluginConfig);
+    } else if (pluginName == "gpu-plugin") {
+        ret = SetSerializeGpuConfig(pluginName, pluginConfig);
     } else {
         printf("unsupport plugin: %s\n", pluginName.c_str());
     }
@@ -391,3 +394,19 @@ bool ParsePluginConfig::SetSerializeXpowerConfig(const std::string& pluginName,
     pluginConfig.set_config_data((const void*)configDataVec.data(), configDataVec.size());
     return true;
 }
+
+bool ParsePluginConfig::SetSerializeGpuConfig(const std::string& pluginName, ProfilerPluginConfig& pluginConfig)
+{
+    std::string configData = pluginConfigMap[pluginName];
+    auto gpuConfigNolite = std::make_unique<ForStandard::GpuConfig>();
+    if (!parser_.ParseFromString(configData, gpuConfigNolite.get())) {
+        return false;
+    }
+
+    std::vector<uint8_t> configDataVec(gpuConfigNolite->ByteSizeLong());
+    if (gpuConfigNolite->SerializeToArray(configDataVec.data(), configDataVec.size()) <= 0) {
+        return false;
+    }
+    pluginConfig.set_config_data((const void*)configDataVec.data(), configDataVec.size());
+    return true;
+}
diff --git a/device/cmds/test/BUILD.gn b/device/cmds/test/BUILD.gn
index f48bceb6a..44c7b03f2 100644
--- a/device/cmds/test/BUILD.gn
+++ b/device/cmds/test/BUILD.gn
@@ -37,6 +37,7 @@ ohos_unittest("hiprofiler_cmd_ut") {
     "${OHOS_PROFILER_DIR}/protos/services:profiler_service_type_source",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/arkts_plugin:arkts_plugin_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/cpu_data:cpu_plugin_config_cpp_standard",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/diskio_data:diskio_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/ftrace_data/default:ftrace_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hidump_data:hidump_plugin_config_cpp_standard",
diff --git a/device/ohos_test.xml b/device/ohos_test.xml
index 42bde8bce..b1ed04360 100644
--- a/device/ohos_test.xml
+++ b/device/ohos_test.xml
@@ -189,4 +189,10 @@
             <option name="shell" value="aa force-stop com.taobao.taobao"/>
         </cleaner>
     </target>
+    <target name="gpudataplugin_ut">
+        <preparer>
+            <option name="push" value="plugins/gpu_plugin/test/resources/gpustat1 -> /data/local/tmp/" src="res"/>
+            <option name="push" value="plugins/gpu_plugin/test/resources/gpustat2 -> /data/local/tmp/" src="res"/>
+        </preparer>
+    </target>
 </configuration>
diff --git a/device/plugins/api/src/main.cpp b/device/plugins/api/src/main.cpp
index 4aef29d93..33f451c9c 100644
--- a/device/plugins/api/src/main.cpp
+++ b/device/plugins/api/src/main.cpp
@@ -42,6 +42,7 @@ const char DEFAULT_LIB_PATH[] = "/system/lib/";
 
 std::vector<std::string> presetPluginVec = {
     "libcpudataplugin.z.so",
+    "libgpudataplugin.z.so",
     "libdiskiodataplugin.z.so",
     "libftrace_plugin.z.so",
     "libhidumpplugin.z.so",
diff --git a/device/plugins/gpu_plugin/BUILD.gn b/device/plugins/gpu_plugin/BUILD.gn
new file mode 100644
index 000000000..d4d7fa5ac
--- /dev/null
+++ b/device/plugins/gpu_plugin/BUILD.gn
@@ -0,0 +1,75 @@
+# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../base/config.gni")
+
+ohos_source_set("gpudataplugin_source") {
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  sources = [
+    "../memory_plugin/src/buffer_splitter.cpp",
+    "src/gpu_data_plugin.cpp",
+    "src/gpu_module.cpp",
+  ]
+  include_dirs = [
+    "include",
+    "../memory_plugin/include",
+    "${OHOS_PROFILER_DIR}/interfaces/kits",
+    "${OHOS_PROFILER_DIR}/device/base/include",
+    "//third_party/bounds_checking_function/include",
+  ]
+  deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+    "${OHOS_PROFILER_DIR}/proto_encoder:proto_encoder_source",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_data_cpp",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_data_encoder",
+    "//third_party/bounds_checking_function:libsec_static",
+  ]
+  if (current_toolchain != host_toolchain) {
+    defines = [ "HAVE_HILOG" ]
+    external_deps = [ "hilog:libhilog" ]
+  }
+  public_configs = [ "${OHOS_PROFILER_DIR}/device/base:hiprofiler_test_config" ]
+}
+
+ohos_shared_library("gpudataplugin") {
+  output_name = "gpudataplugin"
+
+  deps = [ ":gpudataplugin_source" ]
+  install_enable = true
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_executable("gpudataplugintest") {
+  output_name = "gpudataplugintest"
+  sources = [ "src/test_main.cpp" ]
+  include_dirs = [
+    "include",
+    "../api/include",
+    "${OHOS_PROFILER_DIR}/interfaces/kits",
+    "${OHOS_PROFILER_DIR}/device/base/include",
+  ]
+  deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_data_cpp",
+  ]
+  if (current_toolchain != host_toolchain) {
+    defines = [ "HAVE_HILOG" ]
+    external_deps = [ "hilog:libhilog" ]
+  }
+  install_enable = false
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
diff --git a/device/plugins/gpu_plugin/include/gpu_data_plugin.h b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
new file mode 100644
index 000000000..8abc5d2cc
--- /dev/null
+++ b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef GPU_DATA_PLUGIN_H
+#define GPU_DATA_PLUGIN_H
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <string>
+#include <unistd.h>
+#include <fstream>
+#include <iostream>
+
+#include "gpu_plugin_config.pb.h"
+#include "gpu_plugin_result.pb.h"
+#include "logging.h"
+#include "plugin_module_api.h"
+
+enum ErrorType {
+    RET_NULL_ADDR,
+    RET_IVALID_PID,
+    RET_TGID_VALUE_NULL,
+    RET_FAIL = -1,
+    RET_SUCC = 0,
+};
+
+
+
+class GpuDataPlugin {
+public:
+    GpuDataPlugin();
+    ~GpuDataPlugin();
+    int Start(const uint8_t* configData, uint32_t configSize);
+    int Report(uint8_t* data, uint32_t dataSize);
+    int ReportOptimize(RandomWriteCtx* randomWrite);
+    int Stop();
+    // for UT
+    void SetPath(std::string path)
+    {
+        path_ = path;
+    }
+
+private:
+    int32_t ReadFile(std::string& fileName);
+
+    template <typename T> void WriteGpuDataInfo(T& gpuData);
+
+
+private:
+    /* data */
+    GpuConfig protoConfig_;
+    void* buffer_ = nullptr;
+    std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
+    int32_t err_ = -1;
+
+    int pid_ = -1;
+};
+
+#endif
diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
new file mode 100644
index 000000000..5f54fcd43
--- /dev/null
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gpu_data_plugin.h"
+
+#include <ctime>
+#include <vector>
+
+#include "gpu_plugin_result.pbencoder.h"
+#include "buffer_splitter.h"
+
+namespace {
+using namespace OHOS::Developtools::Profiler;
+constexpr size_t READ_BUFFER_SIZE = 1024 * 16;
+const std::string GPU_UTILISATION_PATH = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
+
+} // namespace
+
+GpuDataPlugin::GpuDataPlugin()
+{
+
+}
+
+GpuDataPlugin::~GpuDataPlugin()
+{
+
+}
+
+int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
+{
+    buffer_ = malloc(READ_BUFFER_SIZE);
+    CHECK_NOTNULL(buffer_, RET_FAIL, "%s:malloc buffer_ failed!", __func__);
+
+    CHECK_TRUE(protoConfig_.ParseFromArray(configData, configSize) > 0, RET_FAIL,
+               "%s:parseFromArray failed!", __func__);
+
+    if (protoConfig_.pid() > 0) {
+        pid_ = protoConfig_.pid();
+    }
+    HILOG_INFO(LOG_CORE, "%s:start success!", __func__);
+    return RET_SUCC;
+}
+
+int GpuDataPlugin::ReportOptimize(RandomWriteCtx* randomWrite)
+{
+    ProtoEncoder::GpuData dataProto(randomWrite);
+
+    WriteGpuDataInfo(dataProto);
+
+    int msgSize = dataProto.Finish();
+    return msgSize;
+}
+
+int GpuDataPlugin::Report(uint8_t* data, uint32_t dataSize)
+{
+    GpuData dataProto;
+    uint32_t length;
+
+    WriteGpuDataInfo(dataProto);
+
+    length = dataProto.ByteSizeLong();
+    if (length > dataSize) {
+        return -length;
+    }
+    if (dataProto.SerializeToArray(data, length) > 0) {
+        return length;
+    }
+    return 0;
+}
+
+int GpuDataPlugin::Stop()
+{
+    if (buffer_ != nullptr) {
+        free(buffer_);
+        buffer_ = nullptr;
+    }
+    HILOG_INFO(LOG_CORE, "%s:stop success!", __func__);
+    return 0;
+}
+
+int32_t GpuDataPlugin::ReadFile(std::string& fileName)
+{
+    int fd = -1;
+    ssize_t bytesRead = 0;
+    char filePath[PATH_MAX + 1] = {0};
+    char realPath[PATH_MAX + 1] = {0};
+
+    if (snprintf_s(filePath, sizeof(filePath), sizeof(filePath) - 1, "%s", fileName.c_str()) < 0) {
+        const int bufSize = 256;
+        char buf[bufSize] = { 0 };
+        strerror_r(errno, buf, bufSize);
+        HILOG_ERROR(LOG_CORE, "snprintf_s(%s) error, errno(%d:%s)", fileName.c_str(), errno, buf);
+        return RET_FAIL;
+    }
+    if (realpath(filePath, realPath) == nullptr) {
+        const int bufSize = 256;
+        char buf[bufSize] = { 0 };
+        strerror_r(errno, buf, bufSize);
+        HILOG_ERROR(LOG_CORE, "realpath(%s) failed, errno(%d:%s)", fileName.c_str(), errno, buf);
+        return RET_FAIL;
+    }
+
+    fd = open(realPath, O_RDONLY | O_CLOEXEC);
+    if (fd == -1) {
+        const int bufSize = 256;
+        char buf[bufSize] = { 0 };
+        strerror_r(errno, buf, bufSize);
+        HILOG_ERROR(LOG_CORE, "%s:failed to open(%s), errno(%d:%s)", __func__, realPath, errno, buf);
+        err_ = errno;
+        return RET_FAIL;
+    }
+    if (buffer_ == nullptr) {
+        HILOG_ERROR(LOG_CORE, "%s:empty address, buffer_ is NULL", __func__);
+        err_ = RET_NULL_ADDR;
+        close(fd);
+        return RET_FAIL;
+    }
+    bytesRead = read(fd, buffer_, READ_BUFFER_SIZE - 1);
+    if (bytesRead <= 0) {
+        close(fd);
+        HILOG_ERROR(LOG_CORE, "%s:failed to read(%s), errno=%d", __func__, realPath, errno);
+        err_ = errno;
+        return RET_FAIL;
+    }
+    close(fd);
+
+    return bytesRead;
+}
+
+
+template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
+{
+
+    // write system info
+    std::string fileName = path_;
+    int32_t ret = ReadFile(fileName);
+    if (ret == RET_FAIL) {
+        return;
+    }
+    if ((buffer_ == nullptr) || (ret == 0)) {
+        return;
+    }
+
+    constexpr uint64_t nanoSeconds = 1000000000;
+    struct timespec ts;
+    clock_gettime(CLOCK_BOOTTIME, &ts);
+    uint64_t boottime = (static_cast<uint64_t>(ts.tv_sec) * nanoSeconds +
+        static_cast<uint64_t>(ts.tv_nsec)) / 1000000;
+    gpuData.set_boottime(boottime);
+
+    const char* pFile = reinterpret_cast<char*>(buffer_);
+    BufferSplitter totalbuffer(const_cast<char*>(pFile), ret + 1);
+    std::string curWord = std::string(totalbuffer.CurLine(), totalbuffer.CurLineSize());
+    int utilisation = atoi(curWord.c_str());
+    gpuData.set_gpu_utilisation(utilisation);
+}
diff --git a/device/plugins/gpu_plugin/src/gpu_module.cpp b/device/plugins/gpu_plugin/src/gpu_module.cpp
new file mode 100644
index 000000000..5584f464c
--- /dev/null
+++ b/device/plugins/gpu_plugin/src/gpu_module.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <mutex>
+
+#include "gpu_data_plugin.h"
+
+namespace {
+constexpr uint32_t MAX_BUFFER_SIZE = 4 * 1024 * 1024;
+std::unique_ptr<GpuDataPlugin> g_plugin = nullptr;
+std::mutex g_taskMutex;
+} // namespace
+
+static int GpuDataPluginSessionStart(const uint8_t* configData, uint32_t configSize)
+{
+    std::lock_guard<std::mutex> guard(g_taskMutex);
+    g_plugin = std::make_unique<GpuDataPlugin>();
+    return g_plugin->Start(configData, configSize);
+}
+
+static int GpuPluginReportResult(uint8_t* bufferData, uint32_t bufferSize)
+{
+    std::lock_guard<std::mutex> guard(g_taskMutex);
+    CHECK_NOTNULL(g_plugin, -1, "g_plugin is nullptr");
+    return g_plugin->Report(bufferData, bufferSize);
+}
+
+static int GpuPluginReportResultOptimize(RandomWriteCtx* randomWrite)
+{
+    std::lock_guard<std::mutex> guard(g_taskMutex);
+    return g_plugin->ReportOptimize(randomWrite);
+}
+
+static int GpuPluginSessionStop()
+{
+    std::lock_guard<std::mutex> guard(g_taskMutex);
+    g_plugin->Stop();
+    g_plugin = nullptr;
+    return 0;
+}
+
+static PluginModuleCallbacks g_callbacks = {
+    .onPluginSessionStart = GpuDataPluginSessionStart,
+    .onPluginReportResult = GpuPluginReportResult,
+    .onPluginSessionStop = GpuPluginSessionStop,
+    .onPluginReportResultOptimize = GpuPluginReportResultOptimize,
+};
+
+EXPORT_API PluginModuleStruct g_pluginModule = {
+    .callbacks = &g_callbacks,
+    .name = "gpu-plugin",
+    .version = "1.02",
+    .resultBufferSizeHint = MAX_BUFFER_SIZE,
+};
diff --git a/device/plugins/gpu_plugin/src/test_main.cpp b/device/plugins/gpu_plugin/src/test_main.cpp
new file mode 100644
index 000000000..070e5c746
--- /dev/null
+++ b/device/plugins/gpu_plugin/src/test_main.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dlfcn.h>
+#include <unistd.h>
+
+#include "gpu_plugin_config.pb.h"
+#include "gpu_plugin_result.pb.h"
+#include "plugin_module_api.h"
+
+namespace {
+    int g_testCount = 10;
+}
+
+int main(int agrc, char* agrv[])
+{
+    GpuConfig protoConfig;
+    PluginModuleStruct* gpuPlugin;
+    void* handle = dlopen("./libgpudataplugin.z.so", RTLD_LAZY);
+    if (handle == nullptr) {
+        std::cout << "test:dlopen err: " << dlerror() << std::endl;
+        return 0;
+    }
+    std::cout << "test:handle = " << handle << std::endl;
+    gpuPlugin = (PluginModuleStruct*)dlsym(handle, "g_pluginModule");
+    std::cout << "test:name = " << gpuPlugin->name << std::endl;
+    std::cout << "test:buffer size = " << gpuPlugin->resultBufferSizeHint << std::endl;
+
+    // Serialize config
+    int configLength = protoConfig.ByteSizeLong();
+    std::vector<uint8_t> configBuffer(configLength);
+    int ret = protoConfig.SerializeToArray(configBuffer.data(), configBuffer.size());
+    std::cout << "test:configLength = " << configLength << std::endl;
+    std::cout << "test:serialize success start plugin ret = " << ret << std::endl;
+
+    // Start
+    std::vector<uint8_t> dataBuffer(gpuPlugin->resultBufferSizeHint);
+    gpuPlugin->callbacks->onPluginSessionStart(configBuffer.data(), configLength);
+    while (g_testCount--) {
+        int len = gpuPlugin->callbacks->onPluginReportResult(dataBuffer.data(),
+                                                                gpuPlugin->resultBufferSizeHint);
+        std::cout << "test:filler buffer length = " << len << std::endl;
+
+        if (len > 0) {
+            GpuData gpuData;
+            gpuData.ParseFromArray(dataBuffer.data(), len);
+            std::cout << "test:ParseFromArray length = " << len << std::endl;
+            std::cout << "gpu_utilisation:" << gpuData.gpu_utilisation() << std::endl;
+        }
+
+        std::cout << "test:sleep...................." << std::endl;
+        sleep(1);
+    }
+    gpuPlugin->callbacks->onPluginSessionStop();
+    dlclose(handle);
+
+    return 0;
+}
\ No newline at end of file
diff --git a/device/plugins/gpu_plugin/test/BUILD.gn b/device/plugins/gpu_plugin/test/BUILD.gn
new file mode 100644
index 000000000..9668613a9
--- /dev/null
+++ b/device/plugins/gpu_plugin/test/BUILD.gn
@@ -0,0 +1,57 @@
+# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/test.gni")
+import("../../../base/config.gni")
+
+module_output_path = "${OHOS_PROFILER_TEST_MODULE_OUTPUT_PATH}/device"
+config("module_private_config") {
+  visibility = [ ":*" ]
+  if (current_toolchain != host_toolchain) {
+    defines = [ "HAVE_HILOG" ]
+  }
+}
+
+ohos_unittest("gpudataplugin_ut") {
+  module_out_path = module_output_path
+  sources = [ "unittest/gpu_data_plugin_unittest.cpp" ]
+  deps = [
+    "${OHOS_PROFILER_DIR}/device/plugins/gpu_plugin:gpudataplugin_source",
+    "${OHOS_PROFILER_DIR}/device/plugins/gpu_plugin:gpudataplugintest",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_data_cpp",
+    "//third_party/bounds_checking_function:libsec_static",
+    "//third_party/googletest:gtest_main",
+  ]
+  include_dirs = [
+    "../include",
+    "../../../memory_plugin/include",
+    "${OHOS_PROFILER_DIR}/interfaces/kits",
+    "${OHOS_PROFILER_DIR}/device/base/include",
+    "//third_party/googletest/googletest/include/gtest",
+    "//third_party/bounds_checking_function/include",
+  ]
+  cflags = [
+    "-Wno-inconsistent-missing-override",
+    "-Dprivate=public",  #allow test code access private members
+  ]
+  external_deps = [ "hilog:libhilog" ]
+  configs = [ ":module_private_config" ]
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+  resource_config_file = "${OHOS_PROFILER_DIR}/device/ohos_test.xml"
+}
+
+group("unittest") {
+  testonly = true
+  deps = [ ":gpudataplugin_ut" ]
+}
diff --git a/device/plugins/gpu_plugin/test/resources/gpustat1 b/device/plugins/gpu_plugin/test/resources/gpustat1
new file mode 100644
index 000000000..3cacc0b93
--- /dev/null
+++ b/device/plugins/gpu_plugin/test/resources/gpustat1
@@ -0,0 +1 @@
+12
\ No newline at end of file
diff --git a/device/plugins/gpu_plugin/test/resources/gpustat2 b/device/plugins/gpu_plugin/test/resources/gpustat2
new file mode 100644
index 000000000..301160a93
--- /dev/null
+++ b/device/plugins/gpu_plugin/test/resources/gpustat2
@@ -0,0 +1 @@
+8
\ No newline at end of file
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
new file mode 100644
index 000000000..b50cf9805
--- /dev/null
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <hwext/gtest-ext.h>
+#include <hwext/gtest-tag.h>
+#include <dlfcn.h>
+
+#include "gpu_data_plugin.h"
+#include "plugin_module_api.h"
+
+using namespace testing::ext;
+
+namespace {
+const std::string DEFAULT_TEST_PATH = "/data/local/tmp/";
+#if defined(__LP64__)
+const std::string SO_PATH = "/system/lib64/libgpudataplugin.z.so";
+#else
+const std::string SO_PATH = "/system/lib/libgpudataplugin.z.so";
+#endif
+const std::string DEFAULT_BIN_PATH("/data/local/tmp/gpudataplugintest");
+constexpr uint32_t BUF_SIZE = 4 * 1024 * 1024;
+
+std::string g_path;
+std::string g_testPath;
+
+struct TestVmstat {
+    int64_t pgpgin;
+    int64_t pgpgout;
+};
+
+
+class GpuDataPluginTest : public ::testing::Test {
+public:
+    static void SetUpTestCase() {}
+
+    static void TearDownTestCase()
+    {
+        if (access(g_testPath.c_str(), F_OK) == 0) {
+            std::string str = "rm -rf " + g_testPath;
+            system(str.c_str());
+        }
+    }
+};
+
+string Getexepath()
+{
+    char buf[PATH_MAX] = "";
+    std::string path = "/proc/self/exe";
+    size_t rslt = readlink(path.c_str(), buf, sizeof(buf));
+    if (rslt < 0 || (rslt >= sizeof(buf))) {
+        return "";
+    }
+    buf[rslt] = '\0';
+    for (int i = rslt; i >= 0; i--) {
+        if (buf[i] == '/') {
+            buf[i + 1] = '\0';
+            break;
+        }
+    }
+    return buf;
+}
+
+std::string GetFullPath(std::string path)
+{
+    if (path.size() > 0 && path[0] != '/') {
+        return Getexepath() + path;
+    }
+    return path;
+}
+
+bool PluginGpuInfoStub(GpuDataPlugin& gpuPlugin, GpuData& gpuData, bool unusualBuff)
+{
+    GpuConfig protoConfig;
+    std::vector<uint8_t> configData(protoConfig.ByteSizeLong());
+    int ret = protoConfig.SerializeToArray(configData.data(), configData.size());
+    if (ret < 0) {
+        return false;
+    }
+
+    // start
+    ret = gpuPlugin.Start(configData.data(), configData.size());
+    if (ret < 0) {
+        return false;
+    }
+
+    // report
+    std::vector<uint8_t> bufferData(BUF_SIZE);
+    if (unusualBuff) { // buffer异常，调整缓冲区长度为1，测试异常情况
+        bufferData.resize(1, 0);
+    }
+
+    ret = gpuPlugin.Report(bufferData.data(), bufferData.size());
+    if (ret > 0) {
+        gpuData.ParseFromArray(bufferData.data(), ret);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * @tc.name: gpu plugin
+ * @tc.desc: Test whether the path exists.
+ * @tc.type: FUNC
+ */
+HWTEST_F(GpuDataPluginTest, TestPath, TestSize.Level1)
+{
+    g_path = GetFullPath(DEFAULT_TEST_PATH);
+    g_testPath = g_path;
+    EXPECT_NE("", g_path);
+    g_path += "/gpustat1";
+}
+
+/**
+ * @tc.name: gpu plugin
+ * @tc.desc: gpu information test for specific path.
+ * @tc.type: FUNC
+ */
+HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
+{
+    GpuDataPlugin gpuPlugin;
+    GpuData gpuData;
+    const unsigned long long expect_val = 12;
+    gpuPlugin.SetPath(g_path);
+
+    EXPECT_TRUE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
+    EXPECT_EQ(gpuData.gpu_utilisation(), expect_val);
+
+    EXPECT_EQ(gpuPlugin.Stop(), 0);
+
+    // 缓冲区异常
+    EXPECT_FALSE(PluginGpuInfoStub(gpuPlugin, gpuData, true));
+    EXPECT_EQ(gpuPlugin.Stop(), 0);
+}
+
+/**
+ * @tc.name: gpu plugin
+ * @tc.desc: gpu information test for unusual path.
+ * @tc.type: FUNC
+ */
+HWTEST_F(GpuDataPluginTest, TestPluginBoundary, TestSize.Level1)
+{
+    GpuDataPlugin gpuPlugin;
+    GpuData gpuData;
+    gpuPlugin.SetPath("123");
+    EXPECT_FALSE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
+    gpuPlugin.Stop();
+}
+
+/**
+ * @tc.name: gpu plugin
+ * @tc.desc: gpu plugin registration test.
+ * @tc.type: FUNC
+ */
+HWTEST_F(GpuDataPluginTest, TestPluginRegister, TestSize.Level1)
+{
+    void* handle = dlopen(SO_PATH.c_str(), RTLD_LAZY);
+    ASSERT_NE(handle, nullptr);
+    PluginModuleStruct* gpuPlugin = (PluginModuleStruct*)dlsym(handle, "g_pluginModule");
+    ASSERT_NE(gpuPlugin, nullptr);
+    EXPECT_STREQ(gpuPlugin->name, "gpu-plugin");
+    EXPECT_EQ(gpuPlugin->resultBufferSizeHint, BUF_SIZE);
+
+    // Serialize config
+    GpuConfig protoConfig;
+    int configLength = protoConfig.ByteSizeLong();
+    ASSERT_EQ(configLength, 0);
+    std::vector<uint8_t> configBuffer(configLength);
+    EXPECT_TRUE(protoConfig.SerializeToArray(configBuffer.data(), configLength));
+
+    // run plugin
+    std::vector<uint8_t> dataBuffer(gpuPlugin->resultBufferSizeHint);
+    EXPECT_EQ(gpuPlugin->callbacks->onPluginSessionStart(configBuffer.data(), configLength), RET_SUCC);
+    ASSERT_GT(gpuPlugin->callbacks->onPluginReportResult(dataBuffer.data(), gpuPlugin->resultBufferSizeHint), 0);
+    EXPECT_EQ(gpuPlugin->callbacks->onPluginSessionStop(), RET_SUCC);
+
+    // 反序列化失败导致的start失败
+    configLength++;
+    std::vector<uint8_t> configBuffer2(configLength);
+    EXPECT_TRUE(protoConfig.SerializeToArray(configBuffer2.data(), configLength));
+    EXPECT_EQ(gpuPlugin->callbacks->onPluginSessionStart(configBuffer2.data(), configLength+1), RET_FAIL);
+}
+
+
+} // namespace
\ No newline at end of file
diff --git a/protos/types/plugins/gpu_data/BUILD.gn b/protos/types/plugins/gpu_data/BUILD.gn
new file mode 100644
index 000000000..87a6374cb
--- /dev/null
+++ b/protos/types/plugins/gpu_data/BUILD.gn
@@ -0,0 +1,130 @@
+# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("../../../protos.gni")
+
+gpu_data_sources = [
+  "./gpu_plugin_config.proto",
+  "./gpu_plugin_result.proto",
+]
+
+#######################################################
+proto_out_dir = "$root_gen_dir/cpp/" + rebase_path(".", "//")
+proto_rel_out_dir = rebase_path(proto_out_dir, root_build_dir)
+
+gpu_data_codegen = []
+gpu_data_codegen_standard = []
+gpu_data_codegen_encoder = []
+gpu_data_codegen_all = []
+foreach(proto, gpu_data_sources) {
+  name = get_path_info(proto, "name")
+  gpu_data_codegen += [
+    "$proto_out_dir/$name.pb.h",
+    "$proto_out_dir/$name.pb.cc",
+  ]
+  gpu_data_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+  gpu_data_codegen_encoder += [
+    "$proto_out_dir/$name.pbencoder.h",
+    "$proto_out_dir/$name.pbencoder.cc",
+  ]
+}
+gpu_data_codegen_all += gpu_data_codegen
+gpu_data_codegen_all += gpu_data_codegen_standard
+gpu_data_codegen_all += gpu_data_codegen_encoder
+
+gpu_plugin_config_sources = [ "./gpu_plugin_config.proto" ]
+gpu_plugin_config_codegen_standard = []
+foreach(proto, gpu_plugin_config_sources) {
+  name = get_path_info(proto, "name")
+  gpu_plugin_config_codegen_standard += [
+    "$proto_out_dir/${name}_standard.pb.h",
+    "$proto_out_dir/${name}_standard.pb.cc",
+  ]
+}
+
+config("gpu_include_config") {
+  include_dirs = [ "$proto_out_dir" ]
+}
+
+#######################################################
+action("gpu_data_cpp_gen") {
+  script = "${OHOS_PROFILER_DIR}/build/protoc.sh"
+  sources = gpu_data_sources
+  outputs = gpu_data_codegen_all
+  args = [
+    "$libc_dir_proto",
+    "$root_output_dir_proto",
+    "$proto_rel_out_dir",  # standard proto file destination path
+    "--cpp_out",
+    "$proto_rel_out_dir",
+    "--proto_path",
+    rebase_path(".", root_build_dir),
+  ]
+  args += rebase_path(sources, root_build_dir)
+  deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protoc(${host_toolchain})",
+    "${OHOS_PROFILER_DIR}/device/services/ipc:protoencoder_plugin(${host_toolchain})",
+  ]
+}
+
+ohos_source_set("gpu_data_cpp") {
+  deps = [ ":gpu_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":gpu_include_config" ]
+  sources = gpu_data_codegen
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_source_set("gpu_data_cpp_standard") {
+  deps = [ ":gpu_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":gpu_include_config" ]
+  sources = gpu_data_codegen_standard
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_source_set("gpu_plugin_config_cpp_standard") {
+  deps = [ ":gpu_data_cpp_gen" ]
+  public_deps = [
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf",
+    "${OHOS_PROFILER_3RDPARTY_PROTOBUF_DIR}:protobuf_lite",
+  ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":gpu_include_config" ]
+  sources = gpu_plugin_config_codegen_standard
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
+
+ohos_source_set("gpu_data_encoder") {
+  deps = [ ":gpu_data_cpp_gen" ]
+  include_dirs = [ "$proto_out_dir" ]
+  public_configs = [ ":gpu_include_config" ]
+  sources = gpu_data_codegen_encoder
+  subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
+  part_name = "${OHOS_PROFILER_PART_NAME}"
+}
diff --git a/protos/types/plugins/gpu_data/gpu_plugin_config.proto b/protos/types/plugins/gpu_data/gpu_plugin_config.proto
new file mode 100644
index 000000000..d2585e549
--- /dev/null
+++ b/protos/types/plugins/gpu_data/gpu_plugin_config.proto
@@ -0,0 +1,24 @@
+// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+option java_package = "ohos.devtools.datasources.transport.grpc.service";
+option optimize_for = LITE_RUNTIME;
+
+
+// Cpu plug-in configuration, passed to plug-in by plug-in service.
+message GpuConfig {
+    int32 pid = 1;
+    bool report_gpu_info = 2;
+}
\ No newline at end of file
diff --git a/protos/types/plugins/gpu_data/gpu_plugin_result.proto b/protos/types/plugins/gpu_data/gpu_plugin_result.proto
new file mode 100644
index 000000000..d7918606e
--- /dev/null
+++ b/protos/types/plugins/gpu_data/gpu_plugin_result.proto
@@ -0,0 +1,22 @@
+// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+option java_package = "ohos.devtools.datasources.transport.grpc.service";
+option optimize_for = LITE_RUNTIME;
+
+message GpuData {
+    uint64 boottime = 1;
+    uint64 gpu_utilisation = 2;
+}
\ No newline at end of file

From bd94b9e893f54120b4dfce05ae23ce747d8322db Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Tue, 21 Nov 2023 16:34:59 +0800
Subject: [PATCH 2/9] fix format

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/BUILD.gn                               |  4 ++--
 device/cmds/BUILD.gn                          |  2 +-
 device/cmds/test/BUILD.gn                     |  2 +-
 device/plugins/gpu_plugin/BUILD.gn            |  2 +-
 .../gpu_plugin/include/gpu_data_plugin.h      | 17 ++++-----------
 .../gpu_plugin/src/gpu_data_plugin.cpp        | 21 ++-----------------
 device/plugins/gpu_plugin/src/gpu_module.cpp  |  4 +---
 device/plugins/gpu_plugin/src/test_main.cpp   |  5 ++---
 device/plugins/gpu_plugin/test/BUILD.gn       |  2 +-
 .../unittest/gpu_data_plugin_unittest.cpp     |  6 ++----
 protos/types/plugins/gpu_data/BUILD.gn        |  2 +-
 .../plugins/gpu_data/gpu_plugin_config.proto  |  2 +-
 .../plugins/gpu_data/gpu_plugin_result.proto  |  2 +-
 13 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/device/BUILD.gn b/device/BUILD.gn
index 15a7fccd9..777586e2b 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -20,9 +20,9 @@ group("hiprofiler_targets") {
       "plugins/api:hiprofiler_plugins",
       "plugins/arkts_plugin:arktsplugin",
       "plugins/cpu_plugin:cpudataplugin",
-      "plugins/gpu_plugin:gpudataplugin",
       "plugins/diskio_plugin:diskiodataplugin",
       "plugins/ftrace_plugin:ftrace_targets",
+      "plugins/gpu_plugin:gpudataplugin",
       "plugins/hidump_plugin:hidumpplugin",
       "plugins/hilog_plugin:hilogplugin",
       "plugins/hiperf_plugin:hiperfplugin",
@@ -62,9 +62,9 @@ group("unittest") {
     "plugins/api/test:unittest",
     "plugins/arkts_plugin/test:unittest",
     "plugins/cpu_plugin/test:unittest",
-    "plugins/gpu_plugin/test:unittest",
     "plugins/diskio_plugin/test:unittest",
     "plugins/ftrace_plugin/test:unittest",
+    "plugins/gpu_plugin/test:unittest",
     "plugins/hidump_plugin/test:unittest",
     "plugins/hilog_plugin/test:unittest",
     "plugins/hiperf_plugin/test:unittest",
diff --git a/device/cmds/BUILD.gn b/device/cmds/BUILD.gn
index d60d238fb..0b58246c0 100644
--- a/device/cmds/BUILD.gn
+++ b/device/cmds/BUILD.gn
@@ -41,9 +41,9 @@ ohos_executable("hiprofiler_cmd") {
     "${OHOS_PROFILER_DIR}/protos/services:profiler_service_type_source",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/arkts_plugin:arkts_plugin_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/cpu_data:cpu_plugin_config_cpp_standard",
-    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/diskio_data:diskio_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/ftrace_data/${device_kernel_version}:ftrace_plugin_config_cpp_standard",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hidump_data:hidump_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hiebpf_data:hiebpf_data_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hilog_data:hilog_plugin_config_cpp_standard",
diff --git a/device/cmds/test/BUILD.gn b/device/cmds/test/BUILD.gn
index 44c7b03f2..2966d4755 100644
--- a/device/cmds/test/BUILD.gn
+++ b/device/cmds/test/BUILD.gn
@@ -37,9 +37,9 @@ ohos_unittest("hiprofiler_cmd_ut") {
     "${OHOS_PROFILER_DIR}/protos/services:profiler_service_type_source",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/arkts_plugin:arkts_plugin_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/cpu_data:cpu_plugin_config_cpp_standard",
-    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/diskio_data:diskio_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/ftrace_data/default:ftrace_plugin_config_cpp_standard",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/gpu_data:gpu_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hidump_data:hidump_plugin_config_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hiebpf_data:hiebpf_data_cpp_standard",
     "${OHOS_PROFILER_DIR}/protos/types/plugins/hilog_data:hilog_plugin_config_cpp_standard",
diff --git a/device/plugins/gpu_plugin/BUILD.gn b/device/plugins/gpu_plugin/BUILD.gn
index d4d7fa5ac..e25a43647 100644
--- a/device/plugins/gpu_plugin/BUILD.gn
+++ b/device/plugins/gpu_plugin/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/device/plugins/gpu_plugin/include/gpu_data_plugin.h b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
index 8abc5d2cc..4f5f20521 100644
--- a/device/plugins/gpu_plugin/include/gpu_data_plugin.h
+++ b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -29,19 +29,15 @@
 #include "plugin_module_api.h"
 
 enum ErrorType {
-    RET_NULL_ADDR,
-    RET_IVALID_PID,
-    RET_TGID_VALUE_NULL,
+    RET_NULL_ADDR = -2;
     RET_FAIL = -1,
     RET_SUCC = 0,
 };
 
-
-
 class GpuDataPlugin {
 public:
-    GpuDataPlugin();
-    ~GpuDataPlugin();
+    GpuDataPlugin() = default;
+    ~GpuDataPlugin() = default;
     int Start(const uint8_t* configData, uint32_t configSize);
     int Report(uint8_t* data, uint32_t dataSize);
     int ReportOptimize(RandomWriteCtx* randomWrite);
@@ -54,17 +50,12 @@ public:
 
 private:
     int32_t ReadFile(std::string& fileName);
-
     template <typename T> void WriteGpuDataInfo(T& gpuData);
 
-
 private:
-    /* data */
     GpuConfig protoConfig_;
     void* buffer_ = nullptr;
-    std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
     int32_t err_ = -1;
-
     int pid_ = -1;
 };
 
diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
index 5f54fcd43..7841a3515 100644
--- a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,30 +14,17 @@
  */
 
 #include "gpu_data_plugin.h"
-
 #include <ctime>
 #include <vector>
-
 #include "gpu_plugin_result.pbencoder.h"
 #include "buffer_splitter.h"
 
 namespace {
 using namespace OHOS::Developtools::Profiler;
 constexpr size_t READ_BUFFER_SIZE = 1024 * 16;
-const std::string GPU_UTILISATION_PATH = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
-
+const std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
 } // namespace
 
-GpuDataPlugin::GpuDataPlugin()
-{
-
-}
-
-GpuDataPlugin::~GpuDataPlugin()
-{
-
-}
-
 int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
 {
     buffer_ = malloc(READ_BUFFER_SIZE);
@@ -56,9 +43,7 @@ int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
 int GpuDataPlugin::ReportOptimize(RandomWriteCtx* randomWrite)
 {
     ProtoEncoder::GpuData dataProto(randomWrite);
-
     WriteGpuDataInfo(dataProto);
-
     int msgSize = dataProto.Finish();
     return msgSize;
 }
@@ -67,7 +52,6 @@ int GpuDataPlugin::Report(uint8_t* data, uint32_t dataSize)
 {
     GpuData dataProto;
     uint32_t length;
-
     WriteGpuDataInfo(dataProto);
 
     length = dataProto.ByteSizeLong();
@@ -142,7 +126,6 @@ int32_t GpuDataPlugin::ReadFile(std::string& fileName)
 
 template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
 {
-
     // write system info
     std::string fileName = path_;
     int32_t ret = ReadFile(fileName);
diff --git a/device/plugins/gpu_plugin/src/gpu_module.cpp b/device/plugins/gpu_plugin/src/gpu_module.cpp
index 5584f464c..bf3191bc6 100644
--- a/device/plugins/gpu_plugin/src/gpu_module.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_module.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,7 +14,6 @@
  */
 
 #include <mutex>
-
 #include "gpu_data_plugin.h"
 
 namespace {
@@ -47,7 +46,6 @@ static int GpuPluginSessionStop()
 {
     std::lock_guard<std::mutex> guard(g_taskMutex);
     g_plugin->Stop();
-    g_plugin = nullptr;
     return 0;
 }
 
diff --git a/device/plugins/gpu_plugin/src/test_main.cpp b/device/plugins/gpu_plugin/src/test_main.cpp
index 070e5c746..179cd3734 100644
--- a/device/plugins/gpu_plugin/src/test_main.cpp
+++ b/device/plugins/gpu_plugin/src/test_main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,7 +15,6 @@
 
 #include <dlfcn.h>
 #include <unistd.h>
-
 #include "gpu_plugin_config.pb.h"
 #include "gpu_plugin_result.pb.h"
 #include "plugin_module_api.h"
@@ -50,7 +49,7 @@ int main(int agrc, char* agrv[])
     gpuPlugin->callbacks->onPluginSessionStart(configBuffer.data(), configLength);
     while (g_testCount--) {
         int len = gpuPlugin->callbacks->onPluginReportResult(dataBuffer.data(),
-                                                                gpuPlugin->resultBufferSizeHint);
+                                                             gpuPlugin->resultBufferSizeHint);
         std::cout << "test:filler buffer length = " << len << std::endl;
 
         if (len > 0) {
diff --git a/device/plugins/gpu_plugin/test/BUILD.gn b/device/plugins/gpu_plugin/test/BUILD.gn
index 9668613a9..2e3eb97a0 100644
--- a/device/plugins/gpu_plugin/test/BUILD.gn
+++ b/device/plugins/gpu_plugin/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index b50cf9805..48ae4538e 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+ * Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,7 +16,6 @@
 #include <hwext/gtest-ext.h>
 #include <hwext/gtest-tag.h>
 #include <dlfcn.h>
-
 #include "gpu_data_plugin.h"
 #include "plugin_module_api.h"
 
@@ -40,7 +39,6 @@ struct TestVmstat {
     int64_t pgpgout;
 };
 
-
 class GpuDataPluginTest : public ::testing::Test {
 public:
     static void SetUpTestCase() {}
@@ -131,7 +129,7 @@ HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
 {
     GpuDataPlugin gpuPlugin;
     GpuData gpuData;
-    const unsigned long long expect_val = 12;
+    const unsigned long long expectVal = 12;
     gpuPlugin.SetPath(g_path);
 
     EXPECT_TRUE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
diff --git a/protos/types/plugins/gpu_data/BUILD.gn b/protos/types/plugins/gpu_data/BUILD.gn
index 87a6374cb..17f5536c0 100644
--- a/protos/types/plugins/gpu_data/BUILD.gn
+++ b/protos/types/plugins/gpu_data/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+# Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/protos/types/plugins/gpu_data/gpu_plugin_config.proto b/protos/types/plugins/gpu_data/gpu_plugin_config.proto
index d2585e549..7a46f6d1c 100644
--- a/protos/types/plugins/gpu_data/gpu_plugin_config.proto
+++ b/protos/types/plugins/gpu_data/gpu_plugin_config.proto
@@ -1,4 +1,4 @@
-// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+// Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/protos/types/plugins/gpu_data/gpu_plugin_result.proto b/protos/types/plugins/gpu_data/gpu_plugin_result.proto
index d7918606e..78a1a075a 100644
--- a/protos/types/plugins/gpu_data/gpu_plugin_result.proto
+++ b/protos/types/plugins/gpu_data/gpu_plugin_result.proto
@@ -1,4 +1,4 @@
-// Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved.
+// Copyright (c) Huawei Technologies Co., Ltd. 2023. All rights reserved.
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

From b9e099265decac22bb28dca84de2daf0e7fe41b5 Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Tue, 21 Nov 2023 17:26:50 +0800
Subject: [PATCH 3/9] fix error

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/plugins/gpu_plugin/include/gpu_data_plugin.h | 3 ++-
 device/plugins/gpu_plugin/src/gpu_data_plugin.cpp   | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/device/plugins/gpu_plugin/include/gpu_data_plugin.h b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
index 4f5f20521..4fe9d2eea 100644
--- a/device/plugins/gpu_plugin/include/gpu_data_plugin.h
+++ b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
@@ -29,7 +29,7 @@
 #include "plugin_module_api.h"
 
 enum ErrorType {
-    RET_NULL_ADDR = -2;
+    RET_NULL_ADDR = -2,
     RET_FAIL = -1,
     RET_SUCC = 0,
 };
@@ -53,6 +53,7 @@ private:
     template <typename T> void WriteGpuDataInfo(T& gpuData);
 
 private:
+    std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
     GpuConfig protoConfig_;
     void* buffer_ = nullptr;
     int32_t err_ = -1;
diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
index 7841a3515..74fca0b41 100644
--- a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -22,7 +22,6 @@
 namespace {
 using namespace OHOS::Developtools::Profiler;
 constexpr size_t READ_BUFFER_SIZE = 1024 * 16;
-const std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
 } // namespace
 
 int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
@@ -127,8 +126,7 @@ int32_t GpuDataPlugin::ReadFile(std::string& fileName)
 template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
 {
     // write system info
-    std::string fileName = path_;
-    int32_t ret = ReadFile(fileName);
+    int32_t ret = ReadFile(path_);
     if (ret == RET_FAIL) {
         return;
     }

From d2d3c6d4fedfe9ac70bfd4ddee60c43f1a57afee Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Wed, 22 Nov 2023 16:19:49 +0800
Subject: [PATCH 4/9] cleancode

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 .../gpu_plugin/include/gpu_data_plugin.h      | 10 +--
 .../gpu_plugin/src/gpu_data_plugin.cpp        | 78 ++++++-------------
 .../unittest/gpu_data_plugin_unittest.cpp     | 27 +++----
 3 files changed, 34 insertions(+), 81 deletions(-)

diff --git a/device/plugins/gpu_plugin/include/gpu_data_plugin.h b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
index 4fe9d2eea..3d4d3bd2f 100644
--- a/device/plugins/gpu_plugin/include/gpu_data_plugin.h
+++ b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
@@ -42,22 +42,16 @@ public:
     int Report(uint8_t* data, uint32_t dataSize);
     int ReportOptimize(RandomWriteCtx* randomWrite);
     int Stop();
-    // for UT
-    void SetPath(std::string path)
-    {
-        path_ = path;
-    }
 
 private:
-    int32_t ReadFile(std::string& fileName);
+    uint64_t ReadFile();
     template <typename T> void WriteGpuDataInfo(T& gpuData);
 
 private:
-    std::string path_ = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
     GpuConfig protoConfig_;
     void* buffer_ = nullptr;
-    int32_t err_ = -1;
     int pid_ = -1;
+    std::ifstream file;
 };
 
 #endif
diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
index 74fca0b41..4f5f5042c 100644
--- a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -22,6 +22,7 @@
 namespace {
 using namespace OHOS::Developtools::Profiler;
 constexpr size_t READ_BUFFER_SIZE = 1024 * 16;
+const std::string GPU_PATH = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
 } // namespace
 
 int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
@@ -35,6 +36,12 @@ int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
     if (protoConfig_.pid() > 0) {
         pid_ = protoConfig_.pid();
     }
+
+    file.open(GPU_PATH);
+    if (!file.is_open()) {
+        HILOG_ERROR(LOG_CORE, "%s:failed to open(%s)", __func__, GPU_PATH.c_str());
+        return RET_FAIL;
+    }
     HILOG_INFO(LOG_CORE, "%s:start success!", __func__);
     return RET_SUCC;
 }
@@ -69,68 +76,32 @@ int GpuDataPlugin::Stop()
         free(buffer_);
         buffer_ = nullptr;
     }
+    file.close();
     HILOG_INFO(LOG_CORE, "%s:stop success!", __func__);
     return 0;
 }
 
-int32_t GpuDataPlugin::ReadFile(std::string& fileName)
+uint64_t GpuDataPlugin::ReadFile()
 {
-    int fd = -1;
-    ssize_t bytesRead = 0;
-    char filePath[PATH_MAX + 1] = {0};
-    char realPath[PATH_MAX + 1] = {0};
-
-    if (snprintf_s(filePath, sizeof(filePath), sizeof(filePath) - 1, "%s", fileName.c_str()) < 0) {
-        const int bufSize = 256;
-        char buf[bufSize] = { 0 };
-        strerror_r(errno, buf, bufSize);
-        HILOG_ERROR(LOG_CORE, "snprintf_s(%s) error, errno(%d:%s)", fileName.c_str(), errno, buf);
-        return RET_FAIL;
+    file.clear();
+    file.seekg(0);
+    std::string line;
+    std::getline(file, line);
+    for (char charac : line) {
+        if (!isdigit(charac)) {
+            HILOG_ERROR(LOG_CORE, "invalid file content for (%s)", GPU_PATH.c_str());
+            return -1;
+        }
     }
-    if (realpath(filePath, realPath) == nullptr) {
-        const int bufSize = 256;
-        char buf[bufSize] = { 0 };
-        strerror_r(errno, buf, bufSize);
-        HILOG_ERROR(LOG_CORE, "realpath(%s) failed, errno(%d:%s)", fileName.c_str(), errno, buf);
-        return RET_FAIL;
-    }
-
-    fd = open(realPath, O_RDONLY | O_CLOEXEC);
-    if (fd == -1) {
-        const int bufSize = 256;
-        char buf[bufSize] = { 0 };
-        strerror_r(errno, buf, bufSize);
-        HILOG_ERROR(LOG_CORE, "%s:failed to open(%s), errno(%d:%s)", __func__, realPath, errno, buf);
-        err_ = errno;
-        return RET_FAIL;
-    }
-    if (buffer_ == nullptr) {
-        HILOG_ERROR(LOG_CORE, "%s:empty address, buffer_ is NULL", __func__);
-        err_ = RET_NULL_ADDR;
-        close(fd);
-        return RET_FAIL;
-    }
-    bytesRead = read(fd, buffer_, READ_BUFFER_SIZE - 1);
-    if (bytesRead <= 0) {
-        close(fd);
-        HILOG_ERROR(LOG_CORE, "%s:failed to read(%s), errno=%d", __func__, realPath, errno);
-        err_ = errno;
-        return RET_FAIL;
-    }
-    close(fd);
-
-    return bytesRead;
+    return stoi(line);
 }
 
 
 template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
 {
     // write system info
-    int32_t ret = ReadFile(path_);
-    if (ret == RET_FAIL) {
-        return;
-    }
-    if ((buffer_ == nullptr) || (ret == 0)) {
+    uint64_t ret = ReadFile();
+    if (ret == (uint64_t)-1) {
         return;
     }
 
@@ -140,10 +111,5 @@ template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
     uint64_t boottime = (static_cast<uint64_t>(ts.tv_sec) * nanoSeconds +
         static_cast<uint64_t>(ts.tv_nsec)) / 1000000;
     gpuData.set_boottime(boottime);
-
-    const char* pFile = reinterpret_cast<char*>(buffer_);
-    BufferSplitter totalbuffer(const_cast<char*>(pFile), ret + 1);
-    std::string curWord = std::string(totalbuffer.CurLine(), totalbuffer.CurLineSize());
-    int utilisation = atoi(curWord.c_str());
-    gpuData.set_gpu_utilisation(utilisation);
+    gpuData.set_gpu_utilisation(ret);
 }
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index 48ae4538e..c585524f9 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -16,6 +16,7 @@
 #include <hwext/gtest-ext.h>
 #include <hwext/gtest-tag.h>
 #include <dlfcn.h>
+#include <fstream>
 #include "gpu_data_plugin.h"
 #include "plugin_module_api.h"
 
@@ -129,12 +130,17 @@ HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
 {
     GpuDataPlugin gpuPlugin;
     GpuData gpuData;
-    const unsigned long long expectVal = 12;
-    gpuPlugin.SetPath(g_path);
+    const unsigned long long ceil = 100;
+    const unsigned long long floor = 0;
 
     EXPECT_TRUE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
-    EXPECT_EQ(gpuData.gpu_utilisation(), expect_val);
-
+    EXPECT_LE(gpuData.gpu_utilisation(), ceil);
+    EXPECT_GE(gpuData.gpu_utilisation(), floor);
+    gpuPlugin.file.close();
+    gpuPlugin.file.open(g_path);
+    EXPECT_EQ(gpuPlugin.ReadFile(), 12);
+    sleep(5);
+    EXPECT_EQ(gpuPlugin.ReadFile(), 12);
     EXPECT_EQ(gpuPlugin.Stop(), 0);
 
     // 缓冲区异常
@@ -142,19 +148,6 @@ HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
     EXPECT_EQ(gpuPlugin.Stop(), 0);
 }
 
-/**
- * @tc.name: gpu plugin
- * @tc.desc: gpu information test for unusual path.
- * @tc.type: FUNC
- */
-HWTEST_F(GpuDataPluginTest, TestPluginBoundary, TestSize.Level1)
-{
-    GpuDataPlugin gpuPlugin;
-    GpuData gpuData;
-    gpuPlugin.SetPath("123");
-    EXPECT_FALSE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
-    gpuPlugin.Stop();
-}
 
 /**
  * @tc.name: gpu plugin

From 04738caf38d764c2a3ce609251ac93191fc37975 Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Wed, 22 Nov 2023 16:37:01 +0800
Subject: [PATCH 5/9] fix error

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 .../unittest/gpu_data_plugin_unittest.cpp     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index c585524f9..da1b8515c 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -34,6 +34,8 @@ constexpr uint32_t BUF_SIZE = 4 * 1024 * 1024;
 
 std::string g_path;
 std::string g_testPath;
+const unsigned long long expectVal = 12;
+const unsigned long long sleepTime = 5;
 
 struct TestVmstat {
     int64_t pgpgin;
@@ -93,13 +95,15 @@ bool PluginGpuInfoStub(GpuDataPlugin& gpuPlugin, GpuData& gpuData, bool unusualB
     if (ret < 0) {
         return false;
     }
-
+    
+    gpuPlugin.file.close();
+    gpuPlugin.file.open(g_path);
     // report
     std::vector<uint8_t> bufferData(BUF_SIZE);
     if (unusualBuff) { // buffer异常，调整缓冲区长度为1，测试异常情况
         bufferData.resize(1, 0);
     }
-
+ 
     ret = gpuPlugin.Report(bufferData.data(), bufferData.size());
     if (ret > 0) {
         gpuData.ParseFromArray(bufferData.data(), ret);
@@ -130,17 +134,13 @@ HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
 {
     GpuDataPlugin gpuPlugin;
     GpuData gpuData;
-    const unsigned long long ceil = 100;
-    const unsigned long long floor = 0;
 
     EXPECT_TRUE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
-    EXPECT_LE(gpuData.gpu_utilisation(), ceil);
-    EXPECT_GE(gpuData.gpu_utilisation(), floor);
-    gpuPlugin.file.close();
-    gpuPlugin.file.open(g_path);
-    EXPECT_EQ(gpuPlugin.ReadFile(), 12);
-    sleep(5);
-    EXPECT_EQ(gpuPlugin.ReadFile(), 12);
+    EXPECT_EQ(gpuData.gpu_utilisation(), expectVal);
+
+    EXPECT_EQ(gpuPlugin.ReadFile(), expectVal);
+    sleep(sleepTime);
+    EXPECT_EQ(gpuPlugin.ReadFile(), expectVal);
     EXPECT_EQ(gpuPlugin.Stop(), 0);
 
     // 缓冲区异常

From 3dc80b6b2831c7ae218087eeccfd31bd1f04237e Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Thu, 23 Nov 2023 09:30:23 +0800
Subject: [PATCH 6/9] fix format

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 .../gpu_plugin/include/gpu_data_plugin.h      |  5 ++-
 .../gpu_plugin/src/gpu_data_plugin.cpp        | 33 +++++++------------
 .../unittest/gpu_data_plugin_unittest.cpp     |  4 +--
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/device/plugins/gpu_plugin/include/gpu_data_plugin.h b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
index 3d4d3bd2f..63dde6bd0 100644
--- a/device/plugins/gpu_plugin/include/gpu_data_plugin.h
+++ b/device/plugins/gpu_plugin/include/gpu_data_plugin.h
@@ -44,14 +44,13 @@ public:
     int Stop();
 
 private:
-    uint64_t ReadFile();
+    int ReadFile();
     template <typename T> void WriteGpuDataInfo(T& gpuData);
 
 private:
     GpuConfig protoConfig_;
-    void* buffer_ = nullptr;
     int pid_ = -1;
-    std::ifstream file;
+    std::ifstream file_;
 };
 
 #endif
diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
index 4f5f5042c..edc4b89d5 100644
--- a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -15,21 +15,15 @@
 
 #include "gpu_data_plugin.h"
 #include <ctime>
-#include <vector>
 #include "gpu_plugin_result.pbencoder.h"
-#include "buffer_splitter.h"
 
 namespace {
 using namespace OHOS::Developtools::Profiler;
-constexpr size_t READ_BUFFER_SIZE = 1024 * 16;
 const std::string GPU_PATH = "/sys/class/devfreq/gpufreq/gpu_scene_aware/utilisation";
 } // namespace
 
 int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
 {
-    buffer_ = malloc(READ_BUFFER_SIZE);
-    CHECK_NOTNULL(buffer_, RET_FAIL, "%s:malloc buffer_ failed!", __func__);
-
     CHECK_TRUE(protoConfig_.ParseFromArray(configData, configSize) > 0, RET_FAIL,
                "%s:parseFromArray failed!", __func__);
 
@@ -37,8 +31,8 @@ int GpuDataPlugin::Start(const uint8_t* configData, uint32_t configSize)
         pid_ = protoConfig_.pid();
     }
 
-    file.open(GPU_PATH);
-    if (!file.is_open()) {
+    file_.open(GPU_PATH);
+    if (!file_.is_open()) {
         HILOG_ERROR(LOG_CORE, "%s:failed to open(%s)", __func__, GPU_PATH.c_str());
         return RET_FAIL;
     }
@@ -72,25 +66,21 @@ int GpuDataPlugin::Report(uint8_t* data, uint32_t dataSize)
 
 int GpuDataPlugin::Stop()
 {
-    if (buffer_ != nullptr) {
-        free(buffer_);
-        buffer_ = nullptr;
-    }
-    file.close();
+    file_.close();
     HILOG_INFO(LOG_CORE, "%s:stop success!", __func__);
     return 0;
 }
 
-uint64_t GpuDataPlugin::ReadFile()
+int GpuDataPlugin::ReadFile()
 {
-    file.clear();
-    file.seekg(0);
+    file_.clear();
+    file_.seekg(0);
     std::string line;
-    std::getline(file, line);
+    std::getline(file_, line);
     for (char charac : line) {
         if (!isdigit(charac)) {
             HILOG_ERROR(LOG_CORE, "invalid file content for (%s)", GPU_PATH.c_str());
-            return -1;
+            return RET_FAIL;
         }
     }
     return stoi(line);
@@ -99,9 +89,8 @@ uint64_t GpuDataPlugin::ReadFile()
 
 template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
 {
-    // write system info
-    uint64_t ret = ReadFile();
-    if (ret == (uint64_t)-1) {
+    int ret = ReadFile();
+    if (ret == RET_FAIL) {
         return;
     }
 
@@ -111,5 +100,5 @@ template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
     uint64_t boottime = (static_cast<uint64_t>(ts.tv_sec) * nanoSeconds +
         static_cast<uint64_t>(ts.tv_nsec)) / 1000000;
     gpuData.set_boottime(boottime);
-    gpuData.set_gpu_utilisation(ret);
+    gpuData.set_gpu_utilisation((uint64_t)ret);
 }
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index da1b8515c..24f6121ee 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -96,8 +96,8 @@ bool PluginGpuInfoStub(GpuDataPlugin& gpuPlugin, GpuData& gpuData, bool unusualB
         return false;
     }
     
-    gpuPlugin.file.close();
-    gpuPlugin.file.open(g_path);
+    gpuPlugin.file_.close();
+    gpuPlugin.file_.open(g_path);
     // report
     std::vector<uint8_t> bufferData(BUF_SIZE);
     if (unusualBuff) { // buffer异常，调整缓冲区长度为1，测试异常情况

From b4ffb8f17fa434bd3848a1063b70a9e6b23883fb Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Thu, 23 Nov 2023 10:23:10 +0800
Subject: [PATCH 7/9] fix error

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/plugins/gpu_plugin/src/gpu_data_plugin.cpp    |  3 +--
 .../test/unittest/gpu_data_plugin_unittest.cpp       | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
index edc4b89d5..820d69210 100644
--- a/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
+++ b/device/plugins/gpu_plugin/src/gpu_data_plugin.cpp
@@ -86,7 +86,6 @@ int GpuDataPlugin::ReadFile()
     return stoi(line);
 }
 
-
 template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
 {
     int ret = ReadFile();
@@ -100,5 +99,5 @@ template <typename T> void GpuDataPlugin::WriteGpuDataInfo(T& gpuData)
     uint64_t boottime = (static_cast<uint64_t>(ts.tv_sec) * nanoSeconds +
         static_cast<uint64_t>(ts.tv_nsec)) / 1000000;
     gpuData.set_boottime(boottime);
-    gpuData.set_gpu_utilisation((uint64_t)ret);
+    gpuData.set_gpu_utilisation(static_cast<uint64_t>(ret));
 }
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index 24f6121ee..9de9bdc18 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -34,8 +34,8 @@ constexpr uint32_t BUF_SIZE = 4 * 1024 * 1024;
 
 std::string g_path;
 std::string g_testPath;
-const unsigned long long expectVal = 12;
-const unsigned long long sleepTime = 5;
+const unsigned long long EXPECT_VAL = 12;
+const unsigned long long SLEEP_TIME = 5;
 
 struct TestVmstat {
     int64_t pgpgin;
@@ -136,11 +136,11 @@ HWTEST_F(GpuDataPluginTest, TestPlugin, TestSize.Level1)
     GpuData gpuData;
 
     EXPECT_TRUE(PluginGpuInfoStub(gpuPlugin, gpuData, false));
-    EXPECT_EQ(gpuData.gpu_utilisation(), expectVal);
+    EXPECT_EQ(gpuData.gpu_utilisation(), EXPECT_VAL);
 
-    EXPECT_EQ(gpuPlugin.ReadFile(), expectVal);
-    sleep(sleepTime);
-    EXPECT_EQ(gpuPlugin.ReadFile(), expectVal);
+    EXPECT_EQ(gpuPlugin.ReadFile(), EXPECT_VAL);
+    sleep(SLEEP_TIME);
+    EXPECT_EQ(gpuPlugin.ReadFile(), EXPECT_VAL);
     EXPECT_EQ(gpuPlugin.Stop(), 0);
 
     // 缓冲区异常

From f50348a9375675b9addb17a9cdb2dcea92077f27 Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Thu, 23 Nov 2023 16:42:43 +0800
Subject: [PATCH 8/9] fix test files

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/ohos_test.xml                                          | 4 ++--
 .../gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp     | 2 +-
 .../{resources/gpustat1 => utresources/info/1/gpustat1.txt}   | 0
 .../{resources/gpustat2 => utresources/info/2/gpustat2.txt}   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename device/plugins/gpu_plugin/test/{resources/gpustat1 => utresources/info/1/gpustat1.txt} (100%)
 rename device/plugins/gpu_plugin/test/{resources/gpustat2 => utresources/info/2/gpustat2.txt} (100%)

diff --git a/device/ohos_test.xml b/device/ohos_test.xml
index b1ed04360..db2066461 100644
--- a/device/ohos_test.xml
+++ b/device/ohos_test.xml
@@ -191,8 +191,8 @@
     </target>
     <target name="gpudataplugin_ut">
         <preparer>
-            <option name="push" value="plugins/gpu_plugin/test/resources/gpustat1 -> /data/local/tmp/" src="res"/>
-            <option name="push" value="plugins/gpu_plugin/test/resources/gpustat2 -> /data/local/tmp/" src="res"/>
+            <option name="push" value="plugins/gpu_plugin/test/utresources/info/1/gpustat1.txt -> /data/local/tmp/" src="res"/>
+            <option name="push" value="plugins/gpu_plugin/test/utresources/info/2/gpustat2.txt -> /data/local/tmp/" src="res"/>
         </preparer>
     </target>
 </configuration>
diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index 9de9bdc18..0d7f01c0c 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -122,7 +122,7 @@ HWTEST_F(GpuDataPluginTest, TestPath, TestSize.Level1)
     g_path = GetFullPath(DEFAULT_TEST_PATH);
     g_testPath = g_path;
     EXPECT_NE("", g_path);
-    g_path += "/gpustat1";
+    g_path += "gpustat1.txt";
 }
 
 /**
diff --git a/device/plugins/gpu_plugin/test/resources/gpustat1 b/device/plugins/gpu_plugin/test/utresources/info/1/gpustat1.txt
similarity index 100%
rename from device/plugins/gpu_plugin/test/resources/gpustat1
rename to device/plugins/gpu_plugin/test/utresources/info/1/gpustat1.txt
diff --git a/device/plugins/gpu_plugin/test/resources/gpustat2 b/device/plugins/gpu_plugin/test/utresources/info/2/gpustat2.txt
similarity index 100%
rename from device/plugins/gpu_plugin/test/resources/gpustat2
rename to device/plugins/gpu_plugin/test/utresources/info/2/gpustat2.txt

From b38a7ea3124748d6156d677bfa97d085d2ff96f9 Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Thu, 23 Nov 2023 16:49:08 +0800
Subject: [PATCH 9/9] fix error

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 .../gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
index 0d7f01c0c..7f0ea99b3 100644
--- a/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
+++ b/device/plugins/gpu_plugin/test/unittest/gpu_data_plugin_unittest.cpp
@@ -122,7 +122,7 @@ HWTEST_F(GpuDataPluginTest, TestPath, TestSize.Level1)
     g_path = GetFullPath(DEFAULT_TEST_PATH);
     g_testPath = g_path;
     EXPECT_NE("", g_path);
-    g_path += "gpustat1.txt";
+    g_path += "/gpustat1.txt";
 }
 
 /**