diff --git a/libpandabase/os/unix/native_stack.cpp b/libpandabase/os/unix/native_stack.cpp index e494a52bdaf9a9d3f962534df8cba5228d428eea..5cb090f71b3ba5e531df334d824b68192f675bc7 100644 --- a/libpandabase/os/unix/native_stack.cpp +++ b/libpandabase/os/unix/native_stack.cpp @@ -23,7 +23,7 @@ namespace panda::os::unix::native_stack { static constexpr int MOVE_2 = 2; // delete kernel stack's prefix -static constexpr int STACK_TYPE = 2; // for call ANR type +static constexpr int STACK_TYPE = 2; // for calling Application Not Responding stack type static constexpr int FIND_TID = 10; // decimal number std::string GetNativeThreadNameForFile(pid_t tid) @@ -75,7 +75,7 @@ void DumpKernelStack(std::ostream &os, pid_t tid, const char *tag, bool count) const char *kernel_stack_build = kernel_stack_frames[i].c_str(); // change the stack string, case: // kernel stack in linux file is : "[<0>] do_syscall_64+0x73/0x130" - // kernel stack in ANR file is : "do_syscall_64+0x73/0x130" + // kernel stack in Application Not Responding file is : "do_syscall_64+0x73/0x130" const char *remove_bracket = strchr(kernel_stack_build, ']'); if (remove_bracket != nullptr) { kernel_stack_build = remove_bracket + MOVE_2; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic) diff --git a/runtime/include/runtime_options.h b/runtime/include/runtime_options.h index 614c16c98397a1407d78b22ad5d6f0854cdd6bf6..69eb18a83f96a053c1ff85aa51b613ac2f68919a 100644 --- a/runtime/include/runtime_options.h +++ b/runtime/include/runtime_options.h @@ -211,14 +211,14 @@ public: return unwindstack_; } - void SetTombstoneConnect(void *in) + void SetCrashConnect(void *in) { - tombstone_connect_ = reinterpret_cast(in); + crash_connect_ = reinterpret_cast(in); } - void *GetTombstoneConnect() + void *GetCrashConnect() { - return tombstone_connect_; + return crash_connect_; } void SetMobileLog(void *mlog_buf_print_ptr) @@ -269,7 +269,7 @@ private: void *mlog_buf_print_ptr_ {nullptr}; std::string fingerPrint_ {"unknown"}; void *unwindstack_ {nullptr}; - void *tombstone_connect_ {nullptr}; + void *crash_connect_ {nullptr}; friend class panda::JSNApi; friend class coretypes::test::ArrayTest; diff --git a/runtime/mem/gc/gc.h b/runtime/mem/gc/gc.h index 6bc3618e46dcccfd478bc8f1db869b2420e973e7..2380767069caa172d490703d0fe5df5c2ca4eda4 100644 --- a/runtime/mem/gc/gc.h +++ b/runtime/mem/gc/gc.h @@ -124,7 +124,7 @@ public: }; struct GCSettings { - bool is_gc_enable_tracing = false; /// tracing via systrace + bool is_gc_enable_tracing = false; /// if true then enable tracing NativeGcTriggerType native_gc_trigger_type = { NativeGcTriggerType::INVALID_NATIVE_GC_TRIGGER}; /// type of native trigger bool is_dump_heap = false; /// dump heap at the beginning and the end of GC diff --git a/runtime/mem/refstorage/reference_storage.cpp b/runtime/mem/refstorage/reference_storage.cpp index 71f7eb704848d26da42534776437ac827e315123..4e960817d41fd55cc7d9db5c812bf5baf9e280d2 100644 --- a/runtime/mem/refstorage/reference_storage.cpp +++ b/runtime/mem/refstorage/reference_storage.cpp @@ -139,7 +139,7 @@ void ReferenceStorage::RemoveRef(const Reference *ref) if (ref_check_validate_) { if (UNLIKELY(!IsValidRef(ref))) { - // Undefined behavior, we just print warning here to comply with ART. + // Undefined behavior, we just print warning here. LOG(WARNING, RUNTIME) << "Try to remove not existed ref: " << std::hex << ref; return; } @@ -169,7 +169,7 @@ ObjectHeader *ReferenceStorage::GetObject(const Reference *ref) if (ref_check_validate_) { if (UNLIKELY(!IsValidRef(ref))) { - // Undefined behavior, we just print warning here to comply with ART. + // Undefined behavior, we just print warning here. LOG(WARNING, RUNTIME) << "Try to GetObject from a not existed ref: " << std::hex << ref; return nullptr; } diff --git a/runtime/signal_handler.cpp b/runtime/signal_handler.cpp index ecad913feb60dc210f504d31b1cce98e29eee080..c9d227de9f1d4ff0682197ccdeba9f5b88828a7e 100644 --- a/runtime/signal_handler.cpp +++ b/runtime/signal_handler.cpp @@ -128,7 +128,7 @@ bool SignalManager::SignalActionHandler(int sig, siginfo_t *info, void *context) } bool SignalManager::InOatCode([[maybe_unused]] const siginfo_t *siginfo, [[maybe_unused]] const void *context, - [[maybe_unused]] bool check_dex_pc) + [[maybe_unused]] bool check_bytecode_pc) { return true; } diff --git a/runtime/signal_handler.h b/runtime/signal_handler.h index 17a058987261623f861e81c36fccc09e6d6dcfb0..a75e5eeb99e49b67f47a2147b1f7e9de1d710e73 100644 --- a/runtime/signal_handler.h +++ b/runtime/signal_handler.h @@ -38,7 +38,7 @@ public: } bool SignalActionHandler(int sig, siginfo_t *info, void *context); - bool InOatCode(const siginfo_t *siginfo, const void *context, bool check_dex_pc); + bool InOatCode(const siginfo_t *siginfo, const void *context, bool check_bytecode_pc); bool InOtherCode(int sig, siginfo_t *info, void *context); void AddHandler(SignalHandler *handler, bool oat_code); diff --git a/runtime/tests/string_test.cpp b/runtime/tests/string_test.cpp index 4178c2447b8ed2d87f5922b83d051369340dfbe0..150e45e4c4ba54b312fc4969f4dab45a377e2bd6 100644 --- a/runtime/tests/string_test.cpp +++ b/runtime/tests/string_test.cpp @@ -335,8 +335,7 @@ TEST_F(StringTest, ForeignLenghtAndCopyTest3b) TEST_F(StringTest, ForeignLenghtAndCopyTest6b) { std::vector data {0xed, 0xa0, 0x81, 0xed, 0xb0, 0xb7, 0x20, 0x00}; // UTF-16 size is 3 - // To be compatible with ART we support 4-byte utf-8 sequences, so {0xd801, 0xdc37} is encoded to 4 bytes instead of - // 6 + // We support 4-byte utf-8 sequences, so {0xd801, 0xdc37} is encoded to 4 bytes instead of 6 std::vector utf8_data {0xf0, 0x90, 0x90, 0xb7, 0x20, 0x00}; String *string = String::CreateFromMUtf8(data.data(), 3, GetLanguageContext(), Runtime::GetCurrent()->GetPandaVM()); ASSERT_EQ(string->GetMUtf8Length(), utf8_data.size()); diff --git a/runtime/tooling/debug_inf.cpp b/runtime/tooling/debug_inf.cpp index 7ac6bb10d2be7ea28f36e0744acbde0a2e750803..760f7a42b75436845add91c03d11e71b1b55594e 100644 --- a/runtime/tooling/debug_inf.cpp +++ b/runtime/tooling/debug_inf.cpp @@ -16,7 +16,7 @@ #include "include/tooling/debug_inf.h" // -// Debuge interface for native tools(simpleperf, libunwind). +// Debuge interface for native tools(perf, libunwind). // namespace panda::tooling { @@ -55,7 +55,7 @@ struct PCodeMetaInfo { uint64_t timestamp_ = 1; }; -// simpleperf currently use g_jitDebugDescriptor and g_dexDebugDescriptor +// perf currently use g_jitDebugDescriptor and g_dexDebugDescriptor // to find the jit code item and dexfiles. // for using the variable interface, we doesn't change the name in panda // NOLINTNEXTLINE(readability-identifier-naming, fuchsia-statically-constructed-objects)