[vm/heap/metrics] Remove deprecated isolate-based vm heap statistic messages.

Fixes https://dartbug.com/49211
TEST=ci

Change-Id: Icddbebccf84f226b2ac89acb9153353d84658079
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/248680
Reviewed-by: Slava Egorov <vegorov@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
This commit is contained in:
Alexander Aprelev 2022-06-16 15:27:49 +00:00 committed by Commit Bot
parent b46a2d3039
commit abeaa03148
3 changed files with 0 additions and 56 deletions

View file

@ -291,8 +291,6 @@ typedef struct {
const char* type;
const char* reason;
// DEPRECATED: Use [isolate_group_id] instead.
const char* isolate_id;
Dart_IsolateGroupId isolate_group_id;
Dart_GCStats new_space;
@ -460,44 +458,6 @@ DART_EXPORT void Dart_SetThreadName(const char* name);
DART_EXPORT int64_t Dart_VMIsolateCountMetric(); // Counter
DART_EXPORT int64_t Dart_VMCurrentRSSMetric(); // Byte
DART_EXPORT int64_t Dart_VMPeakRSSMetric(); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapOldUsedMetric instead
DART_EXPORT int64_t
Dart_IsolateHeapOldUsedMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapOldUsedMaxMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapOldUsedMaxMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapOldCapacityMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapOldCapacityMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapOldCapacityMaxMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapOldCapacityMaxMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapOldExternalMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapOldExternalMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapNewUsedMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapNewUsedMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapNewUsedMaxMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapNewUsedMaxMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapNewCapacityMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapNewCapacityMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapNewCapacityMaxMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapNewCapacityMaxMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapNewExternalMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapNewExternalMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapGlobalUsedMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapGlobalUsedMetric(Dart_Isolate isolate); // Byte
// DEPRECATED: Use Dart_IsolateGroupHeapGlobalUsedMaxMetric instead.
DART_EXPORT int64_t
Dart_IsolateHeapGlobalUsedMaxMetric(Dart_Isolate isolate); // Byte
DART_EXPORT int64_t
Dart_IsolateGroupHeapOldUsedMetric(Dart_IsolateGroup group); // Byte
DART_EXPORT int64_t

View file

@ -1234,15 +1234,7 @@ VM_METRIC_LIST(VM_METRIC_API)
#undef VM_METRIC_API
#endif // !defined(PRODUCT)
// TODO(dartbug.com/49211): Remove definition of deprecated functions.
#define ISOLATE_GROUP_METRIC_API(type, variable, name, unit) \
DART_EXPORT int64_t Dart_Isolate##variable##Metric(Dart_Isolate isolate) { \
if (isolate == nullptr) { \
FATAL1("%s expects argument 'isolate' to be non-null.", CURRENT_FUNC); \
} \
Isolate* iso = reinterpret_cast<Isolate*>(isolate); \
return iso->group()->Get##variable##Metric()->Value(); \
} \
DART_EXPORT int64_t Dart_IsolateGroup##variable##Metric( \
Dart_IsolateGroup isolate_group) { \
if (isolate_group == nullptr) { \

View file

@ -1035,14 +1035,6 @@ void Heap::RecordAfterGC(GCType type) {
if (Dart::gc_event_callback() != nullptr) {
Dart_GCEvent event;
int64_t isolate_group_uptime_micros = isolate_group_->UptimeMicros();
// TODO(dartbug.com/49211): Remove use of deprecated [isolate_id] field.
auto isolate_id = Utils::CStringUniquePtr(
OS::SCreate(nullptr, ISOLATE_GROUP_SERVICE_ID_FORMAT_STRING,
isolate_group_->id()),
std::free);
event.isolate_id = isolate_id.get();
event.isolate_group_id = isolate_group_->id();
event.type = GCTypeToString(stats_.type_);
event.reason = GCReasonToString(stats_.reason_);