openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-06 23:54:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

issue:https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IA9PV1

Browse Source 
Signed-off-by: caolili123 <caolili14@huawei.com>
This commit is contained in:
caolili123 2024-07-03 17:13:22 +08:00
parent 9c94bd42f7
commit 278100ae3c
6 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/daemon/daemon_thread.cpp
View File

@ -55,7 +55,7 @@ void DaemonThread::StartRunning()
ASSERT(tasks_.empty());
Taskpool::GetCurrentTaskpool()->Initialize();
ASSERT(GetThreadId() == 0);
thread_ = std::make_unique<std::thread>(&DaemonThread::Run, this);
thread_ = std::make_unique<std::thread>([this] {this->Run();});
// Wait until daemon thread is running.
while (!IsRunning());
#ifdef ENABLE_QOS

34
ecmascript/js_thread.cpp
View File

@ -115,24 +115,24 @@ JSThread::JSThread(EcmaVM *vm) : id_(os::thread::GetCurrentThreadId()), vm_(vm)
auto chunk = vm->GetChunk();
if (!vm_->GetJSOptions().EnableGlobalLeakCheck()) {
globalStorage_ = chunk->New<EcmaGlobalStorage<Node>>(this, vm->GetNativeAreaAllocator());
newGlobalHandle_ = std::bind(&EcmaGlobalStorage<Node>::NewGlobalHandle, globalStorage_, std::placeholders::_1);
disposeGlobalHandle_ = std::bind(&EcmaGlobalStorage<Node>::DisposeGlobalHandle, globalStorage_,
std::placeholders::_1);
setWeak_ = std::bind(&EcmaGlobalStorage<Node>::SetWeak, globalStorage_, std::placeholders::_1,
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4);
clearWeak_ = std::bind(&EcmaGlobalStorage<Node>::ClearWeak, globalStorage_, std::placeholders::_1);
isWeak_ = std::bind(&EcmaGlobalStorage<Node>::IsWeak, globalStorage_, std::placeholders::_1);
newGlobalHandle_ = [this](JSTaggedType value) { return globalStorage_->NewGlobalHandle(value); };
disposeGlobalHandle_ = [this](uintptr_t nodeAddr) { globalStorage_->DisposeGlobalHandle(nodeAddr); };
setWeak_ = [this](uintptr_t nodeAddr, void *ref, WeakClearCallback freeGlobalCallBack,
WeakClearCallback nativeFinalizeCallBack) {
return globalStorage_->SetWeak(nodeAddr, ref, freeGlobalCallBack, nativeFinalizeCallBack);
};
clearWeak_ = [this](uintptr_t nodeAddr) { return globalStorage_->ClearWeak(nodeAddr); };
isWeak_ = [this](uintptr_t addr) { return globalStorage_->IsWeak(addr); };
} else {
globalDebugStorage_ =
chunk->New<EcmaGlobalStorage<DebugNode>>(this, vm->GetNativeAreaAllocator());
newGlobalHandle_ = std::bind(&EcmaGlobalStorage<DebugNode>::NewGlobalHandle, globalDebugStorage_,
std::placeholders::_1);
disposeGlobalHandle_ = std::bind(&EcmaGlobalStorage<DebugNode>::DisposeGlobalHandle, globalDebugStorage_,
std::placeholders::_1);
setWeak_ = std::bind(&EcmaGlobalStorage<DebugNode>::SetWeak, globalDebugStorage_, std::placeholders::_1,
std::placeholders::_2, std::placeholders::_3, std::placeholders::_4);
clearWeak_ = std::bind(&EcmaGlobalStorage<DebugNode>::ClearWeak, globalDebugStorage_, std::placeholders::_1);
isWeak_ = std::bind(&EcmaGlobalStorage<DebugNode>::IsWeak, globalDebugStorage_, std::placeholders::_1);
globalDebugStorage_ = chunk->New<EcmaGlobalStorage<DebugNode>>(this, vm->GetNativeAreaAllocator());
newGlobalHandle_ = [this](JSTaggedType value) { return globalDebugStorage_->NewGlobalHandle(value); };
disposeGlobalHandle_ = [this](uintptr_t nodeAddr) { globalDebugStorage_->DisposeGlobalHandle(nodeAddr); };
setWeak_ = [this](uintptr_t nodeAddr, void *ref, WeakClearCallback freeGlobalCallBack,
WeakClearCallback nativeFinalizeCallBack) {
return globalDebugStorage_->SetWeak(nodeAddr, ref, freeGlobalCallBack, nativeFinalizeCallBack);
};
clearWeak_ = [this](uintptr_t nodeAddr) { return globalDebugStorage_->ClearWeak(nodeAddr); };
isWeak_ = [this](uintptr_t addr) { return globalDebugStorage_->IsWeak(addr); };
}
vmThreadControl_ = new VmThreadControl(this);
SetBCStubStatus(BCStubStatus::NORMAL_BC_STUB);

5
ecmascript/mem/heap.cpp
View File

@ -1222,8 +1222,9 @@ size_t Heap::VerifyHeapObjects(VerifyKind verifyKind) const
verifyKind == VerifyKind::VERIFY_EVACUATE_OLD ||
verifyKind == VerifyKind::VERIFY_EVACUATE_FULL) {
inactiveSemiSpace_->EnumerateRegions([this](Region *region) {
region->IterateAllMarkedBits(std::bind(&VerifyObjectVisitor::VerifyInactiveSemiSpaceMarkedObject,
this, std::placeholders::_1));
region->IterateAllMarkedBits([this](void *addr) {
VerifyObjectVisitor::VerifyInactiveSemiSpaceMarkedObject(this, addr);
});
});
}
}

41
ecmascript/mem/parallel_marker.cpp
View File

@ -27,23 +27,25 @@ void Marker::MarkRoots(uint32_t threadId)
ECMA_BYTRACE_NAME(HITRACE_TAG_ARK, "GC::MarkRoots");
ObjectXRay::VisitVMRoots(
heap_->GetEcmaVM(),
std::bind(&Marker::HandleRoots, this, threadId, std::placeholders::_1, std::placeholders::_2),
std::bind(&Marker::HandleRangeRoots, this, threadId, std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3),
std::bind(&Marker::HandleDerivedRoots, this, std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, std::placeholders::_4));
[this, threadId](Root type, ObjectSlot slot) {this->HandleRoots(threadId, type, slot);},
[this, threadId](Root type, ObjectSlot start, ObjectSlot end) {
this->HandleRangeRoots(threadId, type, start, end);
},
[this](Root type, ObjectSlot base, ObjectSlot derived, uintptr_t baseOldObject) {
this->HandleDerivedRoots(type, base, derived, baseOldObject);
});
workManager_->PushWorkNodeToGlobal(threadId, false);
}
void Marker::ProcessNewToEden(uint32_t threadId)
{
heap_->EnumerateNewSpaceRegions(std::bind(&Marker::HandleNewToEdenRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateNewSpaceRegions([this, threadId](Region *region) {this->HandleNewToEdenRSet(threadId, region);});
ProcessMarkStack(threadId);
}
void Marker::ProcessNewToEdenNoMarkStack(uint32_t threadId)
{
heap_->EnumerateNewSpaceRegions(std::bind(&Marker::HandleNewToEdenRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateNewSpaceRegions([this, threadId](Region *region) {this->HandleNewToEdenRSet(threadId, region);});
}
void Marker::MarkJitCodeMap(uint32_t threadId)
@ -53,7 +55,9 @@ void Marker::MarkJitCodeMap(uint32_t threadId)
TRACE_GC(GCStats::Scope::ScopeId::MarkRoots, heap_->GetEcmaVM()->GetEcmaGCStats());
ECMA_BYTRACE_NAME(HITRACE_TAG_ARK, "GC::MarkJitCodeMap");
ObjectXRay::VisitJitCodeMap(heap_->GetEcmaVM(),
std::bind(&Marker::HandleVisitJitCodeMap, this, threadId, std::placeholders::_1));
[this, threadId](std::map<JSTaggedType, JitCodeVector *> &jitCodeMaps) {
this->HandleVisitJitCodeMap(threadId, jitCodeMaps);
});
ProcessMarkStack(threadId);
}
@ -83,31 +87,40 @@ void Marker::HandleVisitJitCodeMap(uint32_t threadId, std::map<JSTaggedType, Jit
void Marker::ProcessOldToNew(uint32_t threadId)
{
heap_->EnumerateOldSpaceRegions(std::bind(&Marker::HandleOldToNewRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateOldSpaceRegions([this, threadId](Region *region) {
this->HandleOldToNewRSet(threadId, region);
});
ProcessMarkStack(threadId);
}
void Marker::ProcessOldToNewNoMarkStack(uint32_t threadId)
{
heap_->EnumerateOldSpaceRegions(std::bind(&Marker::HandleOldToNewRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateOldSpaceRegions([this, threadId](Region *region) {
this->HandleOldToNewRSet(threadId, region);
});
}
void Marker::ProcessOldToNew(uint32_t threadId, Region *region)
{
heap_->EnumerateOldSpaceRegions(std::bind(&Marker::HandleOldToNewRSet, this, threadId, std::placeholders::_1),
region);
heap_->EnumerateOldSpaceRegions([this, threadId](Region *region) {
this->HandleOldToNewRSet(threadId, region);
}, region);
ProcessMarkStack(threadId);
}
void Marker::ProcessSnapshotRSet(uint32_t threadId)
{
heap_->EnumerateSnapshotSpaceRegions(std::bind(&Marker::HandleOldToNewRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateSnapshotSpaceRegions([this, threadId](Region *region) {
this->HandleOldToNewRSet(threadId, region);
});
ProcessMarkStack(threadId);
}
void Marker::ProcessSnapshotRSetNoMarkStack(uint32_t threadId)
{
heap_->EnumerateSnapshotSpaceRegions(std::bind(&Marker::HandleOldToNewRSet, this, threadId, std::placeholders::_1));
heap_->EnumerateSnapshotSpaceRegions([this, threadId](Region *region) {
this->HandleOldToNewRSet(threadId, region);
});
}
void NonMovableMarker::ProcessMarkStack(uint32_t threadId)

24
ecmascript/mem/shared_heap/shared_gc_marker.cpp
View File

@ -53,11 +53,13 @@ void SharedGCMarker::MarkLocalVMRoots(uint32_t threadId, EcmaVM *localVm)
heap->WaitClearTaskFinished();
ObjectXRay::VisitVMRoots(
localVm,
std::bind(&SharedGCMarker::HandleLocalRoots, this, threadId, std::placeholders::_1, std::placeholders::_2),
std::bind(&SharedGCMarker::HandleLocalRangeRoots, this, threadId, std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3),
std::bind(&SharedGCMarker::HandleLocalDerivedRoots, this, std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3, std::placeholders::_4));
[this, threadId](Root type, ObjectSlot slot) {this->HandleLocalRoots(threadId, type, slot);},
[this, threadId](Root type, ObjectSlot start, ObjectSlot end) {
this->HandleLocalRangeRoots(threadId, type, start, end);
},
[this](Root type, ObjectSlot base, ObjectSlot derived, uintptr_t baseOldObject) {
this->HandleLocalDerivedRoots(type, base, derived, baseOldObject);
});
heap->ProcessSharedGCMarkingLocalBuffer();
}
@ -73,25 +75,23 @@ void SharedGCMarker::CollectLocalVMRSet(EcmaVM *localVm)
void SharedGCMarker::MarkSerializeRoots(uint32_t threadId)
{
ECMA_BYTRACE_NAME(HITRACE_TAG_ARK, "SharedGCMarker::MarkSerializeRoots");
auto callback =
std::bind(&SharedGCMarker::HandleRoots, this, threadId, std::placeholders::_1, std::placeholders::_2);
auto callback = [this, threadId](Root type, ObjectSlot slot) {this->HandleRoots(threadId, type, slot);};
Runtime::GetInstance()->IterateSerializeRoot(callback);
}
void SharedGCMarker::MarkStringCache(uint32_t threadId)
{
ECMA_BYTRACE_NAME(HITRACE_TAG_ARK, "SharedGCMarker::MarkStringCache");
auto cacheStringCallback =
std::bind(&SharedGCMarker::HandleLocalRangeRoots, this, threadId, std::placeholders::_1, std::placeholders::_2,
std::placeholders::_3);
auto cacheStringCallback = [this, threadId](Root type, ObjectSlot start, ObjectSlot end) {
this->HandleLocalRangeRoots(threadId, type, start, end);
};
Runtime::GetInstance()->IterateCachedStringRoot(cacheStringCallback);
}
void SharedGCMarker::MarkSharedModule(uint32_t threadId)
{
ECMA_BYTRACE_NAME(HITRACE_TAG_ARK, "SharedGCMarker::MarkSharedModule");
auto visitor = std::bind(&SharedGCMarker::HandleRoots, this, threadId, std::placeholders::_1,
std::placeholders::_2);
auto visitor = [this, threadId](Root type, ObjectSlot slot) {this->HandleRoots(threadId, type, slot);};
SharedModuleManager::GetInstance()->Iterate(visitor);
}

2
ecmascript/taskpool/runner.cpp
View File

@ -30,7 +30,7 @@ Runner::Runner(uint32_t threadNum, const std::function<void(os::thread::native_h
{
for (uint32_t i = 0; i < threadNum; i++) {
// main thread is 0;
std::unique_ptr<std::thread> thread = std::make_unique<std::thread>(&Runner::Run, this, i + 1);
std::unique_ptr<std::thread> thread = std::make_unique<std::thread>([this, i] {this->Run(i + 1);});
threadPool_.emplace_back(std::move(thread));
}