openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-27 12:10:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!6350 Add more state transition points

Browse Source 
Merge pull request !6350 from lukai/nativeState
This commit is contained in:
Gargoyle.h 2024-03-03 04:20:44 +00:00 committed by Gitee
commit c95533cc50
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecmascript/ecma_vm.cpp
View File

@ -261,6 +261,7 @@ bool EcmaVM::Initialize()
EcmaVM::~EcmaVM()
{
ASSERT(thread_->IsInRunningState());
initialized_ = false;
#if defined(ECMASCRIPT_SUPPORT_CPUPROFILER)
if (thread_->isProfiling_) {

3
ecmascript/mem/heap.cpp
View File

@ -165,8 +165,8 @@ void SharedHeap::PrepareRecordRegionsForReclaim()
void SharedHeap::Reclaim()
{
sHugeObjectSpace_->ReclaimHugeRegion();
PrepareRecordRegionsForReclaim();
sHugeObjectSpace_->ReclaimHugeRegion();
if (parallelGC_) {
clearTaskFinished_ = false;
Taskpool::GetCurrentTaskpool()->PostTask(
@ -181,7 +181,6 @@ void SharedHeap::ReclaimRegions()
sSweeper_->WaitAllTaskFinished();
EnumerateOldSpaceRegionsWithRecord([] (Region *region) {
region->ClearMarkGCBitset();
region->ClearCrossRegionRSet();
region->ResetAliveObject();
});
if (!clearTaskFinished_) {

3
ecmascript/mem/heap_region_allocator.cpp
View File

@ -75,7 +75,8 @@ Region *HeapRegionAllocator::AllocateAlignedRegion(Space *space, size_t capacity
void HeapRegionAllocator::FreeRegion(Region *region, size_t cachedSize)
{
auto size = region->GetCapacity();
bool isRegular = !region->InHugeObjectSpace() && !region->InHugeMachineCodeSpace();
bool isRegular = !region->InHugeObjectSpace() && !region->InHugeMachineCodeSpace() &&
!region->InSharedHugeObjectSpace();
auto allocateBase = region->GetAllocateBase();
DecreaseAnnoMemoryUsage(size);

5
ecmascript/mem/region.h
View File

@ -325,6 +325,11 @@ public:
return packedData_.flags_.spaceFlag_ == RegionSpaceFlag::IN_READ_ONLY_SPACE;
}
bool InSharedHugeObjectSpace() const
{
return packedData_.flags_.spaceFlag_ == RegionSpaceFlag::IN_SHARED_HUGE_OBJECT_SPACE;
}
bool InSharedReadOnlySpace() const
{
return packedData_.flags_.spaceFlag_ == RegionSpaceFlag::IN_SHARED_READ_ONLY_SPACE;

2
ecmascript/mem/verification.cpp
View File

@ -225,7 +225,7 @@ void VerifyObjectVisitor::VerifyMarkFull(TaggedObject *object, ObjectSlot slot,
}
}
if (objectRegion->Test(object)) {
if (!valueRegion->Test(value)) {
if (!valueRegion->InSharedHeap() && !valueRegion->Test(value)) {
LogErrorForObjSlot(heap_, "Verify MarkFull: Marked object, slot miss gc_mark bit.", object, slot, value);
}
}

6
ecmascript/napi/jsnapi.cpp
View File

@ -468,7 +468,11 @@ JSTaggedValue Callback::RegisterCallback(ecmascript::EcmaRuntimeCallInfo *ecmaRu
getStackBeforeCallNapiSuccess = thread->GetEcmaVM()->GetProfiler()->GetStackBeforeCallNapi(thread);
}
#endif
Local<JSValueRef> result = nativeFunc(jsiRuntimeCallInfo);
Local<JSValueRef> result;
{
ecmascript::ThreadNativeScope nativeScope(thread);
result = nativeFunc(jsiRuntimeCallInfo);
}
#if defined(ECMASCRIPT_SUPPORT_CPUPROFILER)
if (thread->GetIsProfiling() && function->IsCallNapi() && getStackBeforeCallNapiSuccess) {
thread->GetEcmaVM()->GetProfiler()->GetStackAfterCallNapi(thread);

16
ecmascript/napi/jsnapi_expo.cpp
View File

@ -1436,6 +1436,7 @@ Local<BigIntRef> BigIntRef::New(const EcmaVM *vm, uint64_t input)
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<BigInt> big = BigInt::Uint64ToBigInt(thread, input);
JSHandle<JSTaggedValue> bigint = JSHandle<JSTaggedValue>::Cast(big);
return JSNApiHelper::ToLocal<BigIntRef>(bigint);
@ -1446,6 +1447,7 @@ Local<BigIntRef> BigIntRef::New(const EcmaVM *vm, int64_t input)
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<BigInt> big = BigInt::Int64ToBigInt(thread, input);
JSHandle<JSTaggedValue> bigint = JSHandle<JSTaggedValue>::Cast(big);
return JSNApiHelper::ToLocal<BigIntRef>(bigint);
@ -1456,6 +1458,7 @@ Local<JSValueRef> BigIntRef::CreateBigWords(const EcmaVM *vm, bool sign, uint32_
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<BigInt> big = BigInt::CreateBigWords(thread, sign, size, words);
JSHandle<JSTaggedValue> bigint = JSHandle<JSTaggedValue>::Cast(big);
return JSNApiHelper::ToLocal<JSValueRef>(bigint);
@ -1466,6 +1469,7 @@ void BigIntRef::BigIntToInt64(const EcmaVM *vm, int64_t *value, bool *lossless)
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<JSTaggedValue> bigintVal(JSNApiHelper::ToJSHandle(this));
LOG_IF_SPECIAL(bigintVal, ERROR);
BigInt::BigIntToInt64(thread, bigintVal, value, lossless);
@ -1476,6 +1480,7 @@ void BigIntRef::BigIntToUint64(const EcmaVM *vm, uint64_t *value, bool *lossless
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<JSTaggedValue> bigintVal(JSNApiHelper::ToJSHandle(this));
LOG_IF_SPECIAL(bigintVal, ERROR);
BigInt::BigIntToUint64(thread, bigintVal, value, lossless);
@ -2166,7 +2171,6 @@ Local<FunctionRef> FunctionRef::New(EcmaVM *vm, InternalFunctionCallback nativeF
static void InitClassFunction(EcmaVM *vm, JSHandle<JSFunction> &func, bool callNapi)
{
CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<GlobalEnv> env = vm->GetGlobalEnv();
auto globalConst = thread->GlobalConstants();
JSHandle<JSTaggedValue> accessor = globalConst->GetHandledFunctionPrototypeAccessor();
@ -2701,6 +2705,7 @@ bool JSNApi::InitForConcurrentThread(EcmaVM *vm, ConcurrentCallback cb, void *da
bool JSNApi::InitForConcurrentFunction(EcmaVM *vm, Local<JSValueRef> function, void *taskInfo)
{
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
[[maybe_unused]] LocalScope scope(vm);
JSHandle<JSTaggedValue> funcVal = JSNApiHelper::ToJSHandle(function);
JSHandle<JSFunction> transFunc = JSHandle<JSFunction>::Cast(funcVal);
@ -2946,6 +2951,7 @@ void JSNApi::DestroyJSVM(EcmaVM *ecmaVm)
if (UNLIKELY(ecmaVm == nullptr)) {
return;
}
ecmaVm->GetJSThread()->ManagedCodeBegin();
auto &config = ecmaVm->GetEcmaParamConfiguration();
MemMapAllocator::GetInstance()->DecreaseReserved(config.GetMaxHeapSize());
EcmaVM::Destroy(ecmaVm);
@ -3384,6 +3390,7 @@ bool JSNApi::ExecuteInContext(EcmaVM *vm, const std::string &fileName, const std
{
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
LOG_ECMA(DEBUG) << "start to execute ark file in context: " << fileName;
ecmascript::ThreadManagedScope scope(thread);
EcmaContext::MountContext(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteFromAbcFile(thread, fileName.c_str(), entry, needUpdate)) {
if (thread->HasPendingException()) {
@ -3401,6 +3408,7 @@ bool JSNApi::Execute(EcmaVM *vm, const std::string &fileName, const std::string
{
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
LOG_ECMA(DEBUG) << "start to execute ark file: " << fileName;
ecmascript::ThreadManagedScope scope(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteFromAbcFile(thread, fileName.c_str(), entry, needUpdate)) {
if (thread->HasPendingException()) {
thread->GetCurrentEcmaContext()->HandleUncaughtException();
@ -3418,6 +3426,7 @@ bool JSNApi::Execute(EcmaVM *vm, const uint8_t *data, int32_t size, const std::s
{
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
LOG_ECMA(DEBUG) << "start to execute ark buffer: " << filename;
ecmascript::ThreadManagedScope scope(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteFromBuffer(thread, data, size, entry, filename.c_str(), needUpdate)) {
if (thread->HasPendingException()) {
thread->GetCurrentEcmaContext()->HandleUncaughtException();
@ -3435,6 +3444,7 @@ bool JSNApi::ExecuteModuleBuffer(EcmaVM *vm, const uint8_t *data, int32_t size,
{
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
LOG_ECMA(DEBUG) << "start to execute module buffer: " << filename;
ecmascript::ThreadManagedScope scope(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteModuleBuffer(thread, data, size, filename.c_str(), needUpdate)) {
if (thread->HasPendingException()) {
thread->GetCurrentEcmaContext()->HandleUncaughtException();
@ -3454,6 +3464,7 @@ bool JSNApi::ExecuteSecure(EcmaVM *vm, uint8_t *data, int32_t size, const std::s
LOG_ECMA(ERROR) << "Secure memory check failed, please execute in srcure memory.";
return false;
}
ecmascript::ThreadManagedScope scope(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteFromBufferSecure(thread, data, size, entry, filename.c_str(),
needUpdate)) {
if (thread->HasPendingException()) {
@ -3475,7 +3486,7 @@ bool JSNApi::ExecuteModuleBufferSecure(EcmaVM *vm, uint8_t* data, int32_t size,
LOG_ECMA(ERROR) << "Secure memory check failed, please execute in srcure memory.";
return false;
}
ecmascript::ThreadManagedScope scope(vm->GetJSThread());
ecmascript::ThreadManagedScope scope(thread);
if (!ecmascript::JSPandaFileExecutor::ExecuteModuleBufferSecure(thread, data, size, filename.c_str(),
needUpdate)) {
if (thread->HasPendingException()) {
@ -3570,6 +3581,7 @@ Local<ObjectRef> JSNApi::GetGlobalObject(const EcmaVM *vm)
void JSNApi::ExecutePendingJob(const EcmaVM *vm)
{
CROSS_THREAD_AND_EXCEPTION_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
EcmaVM::ConstCast(vm)->GetJSThread()->GetCurrentEcmaContext()->ExecutePromisePendingJob();
}

18
ecmascript/tests/js_thread_state_test.cpp
View File

@ -61,14 +61,16 @@ public:
{
panda::RuntimeOption postOption;
JSNApi::PostFork(newVm, postOption);
ThreadManagedScope managedScope(JSThread::GetCurrent());
activeThreadCount->fetch_add(1);
if (nativeState) {
ThreadNativeScope nativeScope(JSThread::GetCurrent());
while (!isTestEnded->load()) {}
} else {
while (!isTestEnded->load()) {
JSThread::GetCurrent()->CheckSafepoint();
{
ThreadManagedScope managedScope(JSThread::GetCurrent());
activeThreadCount->fetch_add(1);
if (nativeState) {
ThreadNativeScope nativeScope(JSThread::GetCurrent());
while (!isTestEnded->load()) {}
} else {
while (!isTestEnded->load()) {
JSThread::GetCurrent()->CheckSafepoint();
}
}
}
JSNApi::DestroyJSVM(newVm);