From c8065811caf800ec277f0fdf35a188ac44f7a905 Mon Sep 17 00:00:00 2001 From: jinjiawei Date: Thu, 18 Apr 2024 20:19:01 +0800 Subject: [PATCH] bugfix:gc event log error Signed-off-by: jinjiawei Change-Id: I33670c49be5fce2a998482f4a0390120c28fb5a9 --- bundle.json | 8 ++++---- ecmascript/mem/gc_key_stats.cpp | 16 ++++++++-------- ecmascript/mem/gc_key_stats.h | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bundle.json b/bundle.json index a9aeb32b82..a67b055123 100644 --- a/bundle.json +++ b/bundle.json @@ -20,16 +20,16 @@ ], "rom": "20MB", "ram": "~8000KB", - "hisysevent_config": [ - "//arkcompiler/ets_runtime/hisysevent.yaml" - ], + "hisysevent_config": [ + "//arkcompiler/ets_runtime/hisysevent.yaml" + ], "deps": { "components": [ "faultloggerd", "init", "hitrace", "hilog", - "hisysevent", + "hisysevent", "qos_manager", "runtime_core", "c_utils", diff --git a/ecmascript/mem/gc_key_stats.cpp b/ecmascript/mem/gc_key_stats.cpp index f8d6e19af8..f65b77353f 100644 --- a/ecmascript/mem/gc_key_stats.cpp +++ b/ecmascript/mem/gc_key_stats.cpp @@ -57,20 +57,20 @@ void GCKeyStats::AddGCStatsToKey() AddRecordDataStats(RecordKeyData::GC_TOTAL_MEM_USED, SizeToIntKB(gcStats_->GetRecordData(RecordData::END_OBJ_SIZE))); - AddRecordDataStats(RecordKeyData::GC_TOTAL_MEM_COMMITED, + AddRecordDataStats(RecordKeyData::GC_TOTAL_MEM_COMMITTED, SizeToIntKB(gcStats_->GetRecordData(RecordData::END_COMMIT_SIZE))); AddRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_USED, SizeToIntKB(gcStats_->GetRecordData(RecordData::YOUNG_ALIVE_SIZE))); - AddRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_COMMITED, + AddRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_COMMITTED, SizeToIntKB(gcStats_->GetRecordData(RecordData::YOUNG_COMMIT_SIZE))); AddRecordDataStats(RecordKeyData::GC_OLD_MEM_USED, SizeToIntKB(gcStats_->GetRecordData(RecordData::OLD_ALIVE_SIZE))); - AddRecordDataStats(RecordKeyData::GC_OLD_MEM_COMMITED, + AddRecordDataStats(RecordKeyData::GC_OLD_MEM_COMMITTED, SizeToIntKB(gcStats_->GetRecordData(RecordData::OLD_COMMIT_SIZE))); AddRecordDataStats(RecordKeyData::GC_HUGE_MEM_USED, SizeToIntKB(heap_->GetHugeObjectSpace()->GetHeapObjectSize())); - AddRecordDataStats(RecordKeyData::GC_HUGE_MEM_COMMITED, + AddRecordDataStats(RecordKeyData::GC_HUGE_MEM_COMMITTED, SizeToIntKB(heap_->GetHugeObjectSpace()->GetCommittedSize())); AddRecordKeyDuration(RecordKeyDuration::GC_TOTAL_TIME, @@ -102,13 +102,13 @@ void GCKeyStats::SendSysEvent() const "GC_EVACUTE_TIME", static_cast(GetRecordKeyDuration(RecordKeyDuration::GC_EVACUTE_TIME)), "GC_LONG_TIME", recordCount_, "GC_TOTAL_MEM_USED", GetRecordDataStats(RecordKeyData::GC_TOTAL_MEM_USED), - "GC_TOTAL_MEM_COMMITED", GetRecordDataStats(RecordKeyData::GC_TOTAL_MEM_COMMITED), + "GC_TOTAL_MEM_COMMITTED", GetRecordDataStats(RecordKeyData::GC_TOTAL_MEM_COMMITTED), "GC_ACTIVE_MEM_USED", GetRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_USED), - "GC_ACTIVE_MEM_COMMITED", GetRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_COMMITED), + "GC_ACTIVE_MEM_COMMITTED", GetRecordDataStats(RecordKeyData::GC_ACTIVE_MEM_COMMITTED), "GC_OLD_MEM_USED", GetRecordDataStats(RecordKeyData::GC_OLD_MEM_USED), - "GC_OLD_MEM_COMMITED", GetRecordDataStats(RecordKeyData::GC_OLD_MEM_COMMITED), + "GC_OLD_MEM_COMMITTED", GetRecordDataStats(RecordKeyData::GC_OLD_MEM_COMMITTED), "GC_HUGE_MEM_USED", GetRecordDataStats(RecordKeyData::GC_HUGE_MEM_USED), - "GC_HUGE_MEM_COMMITED", GetRecordDataStats(RecordKeyData::GC_HUGE_MEM_COMMITED)); + "GC_HUGE_MEM_COMMITTED", GetRecordDataStats(RecordKeyData::GC_HUGE_MEM_COMMITTED)); if (ret != 0) { LOG_GC(INFO) << "GCKeyStats HiSysEventWrite Failed! ret = " << ret; } diff --git a/ecmascript/mem/gc_key_stats.h b/ecmascript/mem/gc_key_stats.h index d571e0719c..51707f12c7 100644 --- a/ecmascript/mem/gc_key_stats.h +++ b/ecmascript/mem/gc_key_stats.h @@ -31,13 +31,13 @@ class GCStats; enum class RecordKeyData : uint8_t { GC_TOTAL_MEM_USED = 0, - GC_TOTAL_MEM_COMMITED, + GC_TOTAL_MEM_COMMITTED, GC_ACTIVE_MEM_USED, - GC_ACTIVE_MEM_COMMITED, + GC_ACTIVE_MEM_COMMITTED, GC_OLD_MEM_USED, - GC_OLD_MEM_COMMITED, + GC_OLD_MEM_COMMITTED, GC_HUGE_MEM_USED, - GC_HUGE_MEM_COMMITED, + GC_HUGE_MEM_COMMITTED, NUM_OF_KEY_DATA, FIRST_DATA = GC_TOTAL_MEM_USED, };