Skip to content

Commit 1c3e702

Browse files
author
leejieli
committed
Merge branch 'dev_del_runtime_stack_trace' into 'kuikly-base/2.0.20' (merge request !184)
refactor: 移除 initRuntime 堆栈记录能力
2 parents 56b5c97 + 69ec9ef commit 1c3e702

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

kotlin-native/runtime/src/main/cpp/Runtime.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
#include "RuntimePrivate.hpp"
1717
#include "Worker.h"
1818
#include "KString.h"
19-
// region Tencent Code
20-
#include "StackTrace.hpp"
21-
// endregion
2219
#include <atomic>
2320
#include <cstdlib>
2421
#include <thread>
@@ -85,29 +82,6 @@ enum GlobalRuntimeStatus {
8582

8683
std::atomic<GlobalRuntimeStatus> globalRuntimeStatus = kGlobalRuntimeUninitialized;
8784

88-
// region Tencent Code
89-
std::atomic<std::string*> firstRuntimesStackTrace;
90-
91-
void InitFirstRuntimesStackTrace() {
92-
constexpr int kSkipFrames = 0;
93-
StackTrace trace = StackTrace<>::current(kSkipFrames);
94-
auto stackTraceStrings = GetStackTraceStrings(trace.data());
95-
auto stackTrace = new std::string();
96-
for (const auto& stack : stackTraceStrings) {
97-
stackTrace->append(stack);
98-
stackTrace->append("\n");
99-
}
100-
firstRuntimesStackTrace.store(stackTrace, std::memory_order_seq_cst);
101-
}
102-
103-
extern "C" OBJ_GETTER0(Kotlin_getFirstRuntimeStackTraceString) {
104-
auto stackTrace = firstRuntimesStackTrace.load(std::memory_order_seq_cst);
105-
if (stackTrace == nullptr) {
106-
RETURN_OBJ(nullptr);
107-
}
108-
RETURN_RESULT_OF(CreateStringFromCString, stackTrace->c_str())
109-
}
110-
// endregion
11185

11286
RuntimeState* initRuntime() {
11387
SetKonanTerminateHandler();
@@ -135,9 +109,6 @@ RuntimeState* initRuntime() {
135109
// Keep global variables in state as well.
136110
if (firstRuntime) {
137111
InitOrDeinitGlobalVariables(INIT_GLOBALS, result->memoryState);
138-
// region Tencent Code
139-
InitFirstRuntimesStackTrace();
140-
// endregion
141112
}
142113
InitOrDeinitGlobalVariables(INIT_THREAD_LOCAL_GLOBALS, result->memoryState);
143114
RuntimeAssert(result->status == RuntimeStatus::kUninitialized, "Runtime must still be in the uninitialized state");

kotlin-native/runtime/src/main/kotlin/kotlin/native/runtime/Debugging.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public object Debugging {
3838
public val isThreadStateRunnable: Boolean
3939
get() = Debugging_isThreadStateRunnable()
4040

41-
// region Tencent Code
42-
public val firstRuntimeStackTraceString: String
43-
get() = getFirstRuntimeStackTraceString() ?: ""
44-
// endregion
45-
4641
/**
4742
* Dump memory in binary format to the given POSIX file descriptor and
4843
* returns success flag.
@@ -55,11 +50,6 @@ public object Debugging {
5550

5651
}
5752

58-
// region Tencent Code
59-
@GCUnsafeCall("Kotlin_getFirstRuntimeStackTraceString")
60-
private external fun getFirstRuntimeStackTraceString(): String?
61-
// endregion
62-
6353
@GCUnsafeCall("Kotlin_Debugging_getForceCheckedShutdown")
6454
private external fun Debugging_getForceCheckedShutdown(): Boolean
6555

0 commit comments

Comments
 (0)