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

[K/N] Reenable mark&sweep statistics match assertion

Browse Source
This commit is contained in:
Aleksei.Glushko
2023-08-28 18:33:36 +02:00
committed by Space Team
parent 1437a9bb69
commit a99db60117
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/custom_alloc/cpp/GCApi.cpp
+2
View File
@@ -48,11 +48,13 @@ bool SweepObject(uint8_t* object, FinalizerQueue& finalizerQueue, gc::GCHandle::
CustomAllocDebug("SweepObject: fromExtraObject(%p) = %p", extraObject, ExtraObjectCell::fromExtraObject(extraObject));
finalizerQueue.Push(ExtraObjectCell::fromExtraObject(extraObject));
gcHandle.addMarkedObject();
gcHandle.addKeptObject();
return true;
}
if (!extraObject->getFlag(mm::ExtraObjectData::FLAGS_FINALIZED)) {
CustomAllocDebug("SweepObject(%p): already waiting to be finalized", heapObjHeader);
gcHandle.addMarkedObject();
gcHandle.addKeptObject();
return true;
}
extraObject->UnlinkFromBaseObject();
kotlin-native/runtime/src/gc/common/cpp/GCStatistics.cpp
+5 -12
View File
@@ -208,6 +208,11 @@ void GCHandle::finished() {
if (auto* stat = statByEpoch(epoch_)) {
stat->endTime = static_cast<KLong>(konan::getTimeNanos());
stat->memoryUsageAfter.heap = currentHeapUsage();
if (stat->markStats && stat->sweepStats.heap) {
RuntimeAssert(stat->markStats->markedCount == stat->sweepStats.heap->keptCount,
"Mismatch in statistics: marked %" PRId64 " objects, while %" PRId64 " are alive after sweep",
stat->markStats->markedCount, stat->sweepStats.heap->keptCount);
}
if (stat->rootSet) {
GCLogInfo(
epoch_,
@@ -294,16 +299,6 @@ void GCHandle::threadsAreSuspended() {
if (requestTime) {
auto time = (startTime - *requestTime) / 1000;
GCLogDebug(epoch_, "Suspended all threads in %" PRIu64 " microseconds", time);
return;
}
}
if (last.epoch) {
// Assisted sweeping from the last epoch must be completed before the check can be run.
if (last.markStats && last.sweepStats.heap) {
RuntimeAssert(
last.markStats->markedCount == last.sweepStats.heap->keptCount,
"Mismatch in statistics: marked %" PRId64 " objects, while %" PRId64 " are alive after sweep",
last.markStats->markedCount, last.sweepStats.heap->keptCount);
}
}
}
@@ -323,7 +318,6 @@ void GCHandle::threadsAreResumed() {
if (startTime) {
auto time = (endTime - *startTime) / 1000;
GCLogDebug(epoch_, "Resume all threads. Total pause time is %" PRId64 " microseconds.", time);
return;
}
}
}
@@ -334,7 +328,6 @@ void GCHandle::finalizersDone() {
if (stat->endTime) {
auto time = (*stat->finalizersDoneTime - *stat->endTime) / 1000;
GCLogInfo(epoch_, "Finalization is done in %" PRId64 " microseconds after epoch end.", time);
return;
} else {
GCLogInfo(epoch_, "Finalization is done.");
}