azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Native: support reentrant mode for CalledFromNativeGuard

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2021-06-08 12:25:07 +03:00
committed by Space
parent 1bcafd3cd0
commit 85ab4f68df
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
+1 -1
View File
@@ -3746,7 +3746,7 @@ kotlin::ThreadState kotlin::GetThreadState(MemoryState* thread) noexcept {
return ThreadState::kRunnable; return ThreadState::kRunnable;
} }
ALWAYS_INLINE kotlin::CalledFromNativeGuard::CalledFromNativeGuard() noexcept { ALWAYS_INLINE kotlin::CalledFromNativeGuard::CalledFromNativeGuard(bool reentrant) noexcept {
// no-op, used by the new MM only. // no-op, used by the new MM only.
} }
kotlin-native/runtime/src/main/cpp/Memory.h
+4 -2
View File
@@ -447,13 +447,15 @@ private:
// No-op for old GC. // No-op for old GC.
class CalledFromNativeGuard final : private Pinned { class CalledFromNativeGuard final : private Pinned {
public: public:
ALWAYS_INLINE CalledFromNativeGuard() noexcept; ALWAYS_INLINE CalledFromNativeGuard(bool reentrant = false) noexcept;
~CalledFromNativeGuard() noexcept { ~CalledFromNativeGuard() noexcept {
SwitchThreadState(thread_, ThreadState::kNative); SwitchThreadState(thread_, oldState_, reentrant_);
} }
private: private:
MemoryState* thread_; MemoryState* thread_;
ThreadState oldState_;
bool reentrant_;
}; };
template <ThreadState state, typename R, typename... Args> template <ThreadState state, typename R, typename... Args>
kotlin-native/runtime/src/mm/cpp/Memory.cpp
+2 -2
View File
@@ -532,10 +532,10 @@ MemoryState* kotlin::mm::GetMemoryState() {
return ToMemoryState(ThreadRegistry::Instance().CurrentThreadDataNode()); return ToMemoryState(ThreadRegistry::Instance().CurrentThreadDataNode());
} }
ALWAYS_INLINE kotlin::CalledFromNativeGuard::CalledFromNativeGuard() noexcept { ALWAYS_INLINE kotlin::CalledFromNativeGuard::CalledFromNativeGuard(bool reentrant) noexcept : reentrant_(reentrant) {
Kotlin_initRuntimeIfNeeded(); Kotlin_initRuntimeIfNeeded();
thread_ = mm::GetMemoryState(); thread_ = mm::GetMemoryState();
SwitchThreadState(thread_, ThreadState::kRunnable); oldState_ = SwitchThreadState(thread_, ThreadState::kRunnable, reentrant_);
} }
const bool kotlin::kSupportsMultipleMutators = kotlin::gc::kSupportsMultipleMutators; const bool kotlin::kSupportsMultipleMutators = kotlin::gc::kSupportsMultipleMutators;