From 6f9b31f2db0289a96884109d303f9c56555adc4a Mon Sep 17 00:00:00 2001
From: yuhaoqiang <yuhaoqiang@huawei.com>
Date: Thu, 12 Dec 2024 11:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yuhaoqiang <yuhaoqiang@huawei.com>
Change-Id: Ia07d3ab4fda0f3b6ff8efabd27e1979c1007afb9
Signed-off-by: yuhaoqiang <yuhaoqiang@huawei.com>
---
 interfaces/innerkits/unwinder/thread_context.cpp            | 6 +++---
 .../faultloggerdunwinder_fuzzer.cpp                         | 4 ++--
 tools/crasher_cpp/dfx_crasher.cpp                           | 4 ++--
 tools/process_dump/dfx_fault_stack.cpp                      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/interfaces/innerkits/unwinder/thread_context.cpp b/interfaces/innerkits/unwinder/thread_context.cpp
index c339f6b10..34f1355d0 100644
--- a/interfaces/innerkits/unwinder/thread_context.cpp
+++ b/interfaces/innerkits/unwinder/thread_context.cpp
@@ -41,7 +41,7 @@ namespace {
 
 std::mutex g_localMutex;
 std::map<int32_t, std::shared_ptr<ThreadContext>> g_contextMap {};
-const std::chrono::seconds g_timeOut = std::chrono::seconds(1);
+constexpr std::chrono::seconds TIME_OUT = std::chrono::seconds(1);
 
 void CreateContext(std::shared_ptr<ThreadContext>& threadContext)
 {
@@ -174,7 +174,7 @@ std::shared_ptr<ThreadContext> LocalThreadContext::CollectThreadContext(int32_t
     if (!SignalRequestThread(tid, threadContext.get())) {
         return nullptr;
     }
-    if (threadContext->cv.wait_for(lock, g_timeOut) == std::cv_status::timeout) {
+    if (threadContext->cv.wait_for(lock, TIME_OUT) == std::cv_status::timeout) {
         LOGE("wait_for timeout. tid = %d", tid);
         return nullptr;
     }
@@ -219,7 +219,7 @@ NO_SANITIZE void LocalThreadContext::CopyContextAndWaitTimeout(int sig, siginfo_
 
     ctxPtr->tid = static_cast<int32_t>(ThreadContextStatus::CONTEXT_READY);
     ctxPtr->cv.notify_all();
-    ctxPtr->cv.wait_for(lock, g_timeOut);
+    ctxPtr->cv.wait_for(lock, TIME_OUT);
     ctxPtr->tid = static_cast<int32_t>(ThreadContextStatus::CONTEXT_UNUSED);
 #endif
 }
diff --git a/test/fuzztest/faultloggerdunwinder_fuzzer/faultloggerdunwinder_fuzzer.cpp b/test/fuzztest/faultloggerdunwinder_fuzzer/faultloggerdunwinder_fuzzer.cpp
index 245e85f9c..c5d8ea9df 100644
--- a/test/fuzztest/faultloggerdunwinder_fuzzer/faultloggerdunwinder_fuzzer.cpp
+++ b/test/fuzztest/faultloggerdunwinder_fuzzer/faultloggerdunwinder_fuzzer.cpp
@@ -53,8 +53,8 @@ void TestGetArkNativeFrameInfo(const uint8_t* data, size_t size)
     STREAM_TO_VALUEINFO(data, fp);
     STREAM_TO_VALUEINFO(data, sp);
 
-    const size_t jSFRAME_MAX = 64;
-    JsFrame jsFrames[jSFRAME_MAX];
+    constexpr size_t jsFrameMax = 64;
+    JsFrame jsFrames[jsFrameMax];
 
     DfxArk::GetArkNativeFrameInfo(pid, pc, fp, sp, jsFrames, size);
 }
diff --git a/tools/crasher_cpp/dfx_crasher.cpp b/tools/crasher_cpp/dfx_crasher.cpp
index 8000b4a3a..485899e30 100644
--- a/tools/crasher_cpp/dfx_crasher.cpp
+++ b/tools/crasher_cpp/dfx_crasher.cpp
@@ -583,7 +583,7 @@ NOINLINE int DfxCrasher::AsyncStacktrace()
     pthread_create(&thread, NULL, CrashInSubThread, (void*)&stackId);
     void *result = nullptr;
     pthread_join(thread, &result);
-    return (uint64_t)(result);
+    return reinterpret_cast<uint64_t>(result);
 #else
     printf("Unsupported arch.\n");
     return 0;
@@ -720,7 +720,7 @@ uint64_t DfxCrasher::DoActionOnSubThread(const char *arg) const
     pthread_create(&t, nullptr, DfxCrasher::DoCrashInThread, const_cast<char*>(arg));
     void *result = nullptr;
     pthread_join(t, &result);
-    return (uint64_t)(result);
+    return reinterpret_cast<uint64_t>(result);
 }
 
 int DfxCrasher::Loop()
diff --git a/tools/process_dump/dfx_fault_stack.cpp b/tools/process_dump/dfx_fault_stack.cpp
index 4eb0b6036..b60fb834e 100644
--- a/tools/process_dump/dfx_fault_stack.cpp
+++ b/tools/process_dump/dfx_fault_stack.cpp
@@ -98,9 +98,9 @@ bool FaultStack::CollectStackInfo(const std::vector<DfxFrame>& frames, bool need
 
     auto firstFrame = frames.at(0);
     prevSp = static_cast<uintptr_t>(firstFrame.sp);
-    constexpr size_t MAX_FAULT_STACK_SZ = 4;
+    constexpr size_t maxFaultStackSz = 4;
     for (index = 1; index < frames.size(); index++) {
-        if (index > MAX_FAULT_STACK_SZ) {
+        if (index > maxFaultStackSz) {
             break;
         }
 
@@ -118,7 +118,7 @@ bool FaultStack::CollectStackInfo(const std::vector<DfxFrame>& frames, bool need
         prevSp = curSp;
     }
 
-    if ((blocks_.size() < MAX_FAULT_STACK_SZ) && (prevSp > minAddr)) {
+    if ((blocks_.size() < maxFaultStackSz) && (prevSp > minAddr)) {
         size = highAddrLength;
         prevEndAddr = AdjustAndCreateMemoryBlock(index, prevSp, prevEndAddr, size);
     }
-- 
Gitee