languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VM] Refactors metrics variables to avoid multiple instances per compiled unit.

Browse source 
This moves the definition of the global static VM metric variables
out of the header to avoid defining them multiple times.
This could cause multiple instances which defeats the whole purpose.

Bug: None
Change-Id: Idb8b2da1c2b4591c4824e2bb4b1474437231b3c6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98324
Commit-Queue: Clement Skau <cskau@google.com>
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
This commit is contained in:
Clement Skau 2019-04-02 11:49:18 +00:00 committed by commit-bot@chromium.org
parent 3a93cf9464
commit 405bd06725
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/vm/dart_api_impl.cc
View file

@ -1045,7 +1045,7 @@ DART_EXPORT bool Dart_IsVMFlagSet(const char* flag_name) {
#if !defined(PRODUCT)
#define VM_METRIC_API(type, variable, name, unit) \
DART_EXPORT int64_t Dart_VM##variable##Metric() { \
return vm_metric_##variable##_.value(); \
return vm_metric_##variable.value(); \
}
VM_METRIC_LIST(VM_METRIC_API);
#undef VM_METRIC_API

9
runtime/vm/metrics.cc
View file

@ -303,9 +303,14 @@ int64_t MetricPeakRSS::Value() const {
return Service::MaxRSS();
}
#define VM_METRIC_VARIABLE(type, variable, name, unit) \
type vm_metric_##variable;
VM_METRIC_LIST(VM_METRIC_VARIABLE);
#undef VM_METRIC_VARIABLE
void Metric::Init() {
#define VM_METRIC_INIT(type, variable, name, unit) \
vm_metric_##variable##_.InitInstance(name, NULL, Metric::unit);
vm_metric_##variable.InitInstance(name, NULL, Metric::unit);
VM_METRIC_LIST(VM_METRIC_INIT);
#undef VM_METRIC_INIT
}
@ -323,7 +328,7 @@ void Metric::Cleanup() {
OS::PrintErr("\n");
}
#define VM_METRIC_CLEANUP(type, variable, name, unit) \
vm_metric_##variable##_.CleanupInstance();
vm_metric_##variable.CleanupInstance();
VM_METRIC_LIST(VM_METRIC_CLEANUP);
#undef VM_METRIC_CLEANUP
}

2
runtime/vm/metrics.h
View file

@ -182,7 +182,7 @@ class MetricHeapUsed : public Metric {
#if !defined(PRODUCT)
#define VM_METRIC_VARIABLE(type, variable, name, unit) \
static type vm_metric_##variable##_;
extern type vm_metric_##variable;
VM_METRIC_LIST(VM_METRIC_VARIABLE);
#undef VM_METRIC_VARIABLE
#endif // !defined(PRODUCT)