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

Ensure shared cyclic collector doesn't get dangling root during deinit

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2020-02-20 09:52:55 +03:00
committed by SvyatoslavScherbina
parent 1d2d2569c7
commit 60108071dd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/CyclicCollector.cpp
+5 -1
View File
@@ -134,7 +134,7 @@ class CyclicCollector {
CHECK_CALL(pthread_create(&gcThread_, nullptr, gcWorkerRoutine, this), "Cannot start collector thread") CHECK_CALL(pthread_create(&gcThread_, nullptr, gcWorkerRoutine, this), "Cannot start collector thread")
} }
~CyclicCollector() { void terminate() {
{ {
Locker locker(&lock_); Locker locker(&lock_);
terminateCollector_ = true; terminateCollector_ = true;
@@ -144,6 +144,9 @@ class CyclicCollector {
// TODO: improve waiting for collector termination. // TODO: improve waiting for collector termination.
while (atomicGet(&terminateCollector_)) {} while (atomicGet(&terminateCollector_)) {}
releasePendingUnlocked(nullptr); releasePendingUnlocked(nullptr);
}
~CyclicCollector() {
pthread_cond_destroy(&cond_); pthread_cond_destroy(&cond_);
pthread_mutex_destroy(&lock_); pthread_mutex_destroy(&lock_);
pthread_mutex_destroy(&timestampLock_); pthread_mutex_destroy(&timestampLock_);
@@ -431,6 +434,7 @@ void cyclicDeinit() {
#if WITH_WORKERS #if WITH_WORKERS
RuntimeAssert(cyclicCollector != nullptr, "Must be inited"); RuntimeAssert(cyclicCollector != nullptr, "Must be inited");
auto* local = cyclicCollector; auto* local = cyclicCollector;
local->terminate();
cyclicCollector = nullptr; cyclicCollector = nullptr;
konanDestructInstance(local); konanDestructInstance(local);
#endif // WITH_WORKERS #endif // WITH_WORKERS