From c16c5beee72b5360483d4e4eb20d35c0aa1d2791 Mon Sep 17 00:00:00 2001
From: wuzhihuitmac <wuzhihui4@huawei.com>
Date: Tue, 14 Nov 2023 09:03:46 +0000
Subject: [PATCH] Rectify the miscdevice repository thread name format to OS_
 name

Signed-off-by: wuzhihuitmac <wuzhihui4@huawei.com>
Change-Id: I2ab91e9245c3cf9417f4f5aac653143cdb45115f
---
 interfaces/inner_api/vibrator/vibrator_agent_type.h          | 2 +-
 .../hdi_connection/adapter/src/compatible_connection.cpp     | 3 +++
 services/miscdevice_service/src/vibrator_thread.cpp          | 5 +++++
 utils/common/include/permission_util.h                       | 2 +-
 utils/common/include/raw_file_descriptor.h                   | 2 +-
 utils/common/src/permission_util.cpp                         | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/interfaces/inner_api/vibrator/vibrator_agent_type.h b/interfaces/inner_api/vibrator/vibrator_agent_type.h
index 861eb66..b692a46 100644
--- a/interfaces/inner_api/vibrator/vibrator_agent_type.h
+++ b/interfaces/inner_api/vibrator/vibrator_agent_type.h
@@ -91,7 +91,7 @@ typedef enum VibratorUsage {
     USAGE_MEDIA = 6,              /**< Vibration is used for media */
     USAGE_PHYSICAL_FEEDBACK = 7,  /**< Vibration is used for physical feedback */
     USAGE_SIMULATE_REALITY = 8,   /**< Vibration is used for simulate reality */
-    USAGE_MAX = 9
+    USAGE_MAX
 } VibratorUsage;
 
 /**
diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp
index 45db242..7d084e5 100644
--- a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp
+++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp
@@ -16,6 +16,7 @@
 
 #include <ctime>
 #include <string>
+#include <sys/prctl.h>
 #include <unordered_map>
 #include <vector>
 
@@ -26,6 +27,7 @@ namespace Sensors {
 using namespace OHOS::HiviewDFX;
 namespace {
 constexpr HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "CompatibleConnection" };
+const std::string VIBRATE_MOCK_THREAD_NAME = "OS_VibMock";
 std::unordered_map<std::string, int32_t> g_vibratorEffect = {
     {"haptic.clock.timer", 2000},
     {"haptic.default.effect", 804},
@@ -172,6 +174,7 @@ int32_t CompatibleConnection::DestroyHdiConnection()
 void CompatibleConnection::VibrateProcess()
 {
     CALL_LOG_ENTER;
+    prctl(PR_SET_NAME, VIBRATE_MOCK_THREAD_NAME.c_str());
     clock_t vibrateStartTime = clock();
     while (clock() - vibrateStartTime < duration_) {
         if (isStop_) {
diff --git a/services/miscdevice_service/src/vibrator_thread.cpp b/services/miscdevice_service/src/vibrator_thread.cpp
index eedaec2..724d3f3 100644
--- a/services/miscdevice_service/src/vibrator_thread.cpp
+++ b/services/miscdevice_service/src/vibrator_thread.cpp
@@ -15,6 +15,8 @@
 
 #include "vibrator_thread.h"
 
+#include <sys/prctl.h>
+
 #include "custom_vibration_matcher.h"
 #include "sensors_errors.h"
 
@@ -22,11 +24,14 @@ namespace OHOS {
 namespace Sensors {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MISC_LOG_DOMAIN, "VibratorThread" };
+const std::string VIBRATE_CONTROL_THREAD_NAME = "OS_VibControl";
 constexpr size_t COMPOSITE_EFFECT_PART = 128;
 }  // namespace
 
 bool VibratorThread::Run()
 {
+    CALL_LOG_ENTER;
+    prctl(PR_SET_NAME, VIBRATE_CONTROL_THREAD_NAME.c_str());
     VibrateInfo info = GetCurrentVibrateInfo();
     if (info.mode == VIBRATE_TIME) {
         int32_t ret = PlayOnce(info);
diff --git a/utils/common/include/permission_util.h b/utils/common/include/permission_util.h
index cce531d..fd6adf1 100644
--- a/utils/common/include/permission_util.h
+++ b/utils/common/include/permission_util.h
@@ -30,7 +30,7 @@ class PermissionUtil : public Singleton<PermissionUtil> {
 public:
     PermissionUtil() = default;
     virtual ~PermissionUtil() {};
-    int32_t CheckVibratePermission(AccessTokenID callerToken, std::string permissionName);
+    int32_t CheckVibratePermission(AccessTokenID callerToken, const std::string &permissionName);
 };
 }  // namespace Sensors
 }  // namespace OHOS
diff --git a/utils/common/include/raw_file_descriptor.h b/utils/common/include/raw_file_descriptor.h
index 518fc85..04c0445 100644
--- a/utils/common/include/raw_file_descriptor.h
+++ b/utils/common/include/raw_file_descriptor.h
@@ -21,7 +21,7 @@
 namespace OHOS {
 namespace Sensors {
 struct RawFileDescriptor {
-    int32_t fd = 0;
+    int32_t fd = -1;
     int64_t offset = 0;
     int64_t length = -1;
 };
diff --git a/utils/common/src/permission_util.cpp b/utils/common/src/permission_util.cpp
index 6b0fea6..f7d7107 100644
--- a/utils/common/src/permission_util.cpp
+++ b/utils/common/src/permission_util.cpp
@@ -21,7 +21,7 @@ namespace OHOS {
 namespace Sensors {
 using namespace OHOS::HiviewDFX;
 
-int32_t PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, std::string permissionName)
+int32_t PermissionUtil::CheckVibratePermission(AccessTokenID callerToken, const std::string &permissionName)
 {
     return AccessTokenKit::VerifyAccessToken(callerToken, permissionName);
 }
-- 
Gitee