Skip to content

Commit b5c911e

Browse files
rmacnak-googlecommit-bot@chromium.org
authored andcommitted
[observatory] Report AppJIT/AOT feature string.
TEST=examine main page Change-Id: I368b96e1a871a8d5da4cfab5c3fcf7c297a589be Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/215945 Reviewed-by: Siva Annamalai <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent 519c222 commit b5c911e

File tree

5 files changed

+24
-2
lines changed

5 files changed

+24
-2
lines changed

runtime/observatory/lib/src/elements/vm_view.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,16 @@ class VMViewElement extends CustomElement implements Renderable {
258258
..classes = ['memberValue']
259259
..text = _vm.version
260260
],
261+
new DivElement()
262+
..classes = ['memberItem']
263+
..children = <Element>[
264+
new DivElement()
265+
..classes = ['memberName']
266+
..text = 'features',
267+
new DivElement()
268+
..classes = ['memberValue']
269+
..text = _vm.features
270+
],
261271
new DivElement()
262272
..classes = ['memberItem']
263273
..children = <Element>[

runtime/observatory/lib/src/models/objects/vm.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ abstract class VM implements VMRef {
2626
/// The Dart VM version string.
2727
String get version;
2828

29+
String get features;
30+
2931
String get embedder;
3032

3133
/// The amount of memory currently allocated by native code in zones.

runtime/observatory/lib/src/service/object.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ abstract class VM extends ServiceObjectOwner implements M.VM {
672672
final List<Service> services = <Service>[];
673673

674674
String version = 'unknown';
675+
String features = 'unknown';
675676
String hostCPU = 'unknown';
676677
String targetCPU = 'unknown';
677678
String embedder = 'unknown';
@@ -1030,6 +1031,7 @@ abstract class VM extends ServiceObjectOwner implements M.VM {
10301031

10311032
_loaded = true;
10321033
version = map['version'];
1034+
features = map['_features'] ?? 'unknown';
10331035
hostCPU = map['hostCPU'];
10341036
targetCPU = map['targetCPU'];
10351037
architectureBits = map['architectureBits'];

runtime/vm/dart.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ const char* Dart::FeaturesString(IsolateGroup* isolate_group,
10911091
do { \
10921092
const bool value = \
10931093
isolate_group != nullptr ? isolate_group->name() : flag; \
1094-
ADD_FLAG(#name, value); \
1094+
ADD_FLAG(name, value); \
10951095
} while (0);
10961096

10971097
if (Snapshot::IncludesCode(kind)) {
@@ -1134,7 +1134,9 @@ const char* Dart::FeaturesString(IsolateGroup* isolate_group,
11341134
#error What architecture?
11351135
#endif
11361136
#if defined(DART_COMPRESSED_POINTERS)
1137-
buffer.AddString(" compressed");
1137+
buffer.AddString(" compressed-pointers");
1138+
#else
1139+
buffer.AddString(" no-compressed-pointers");
11381140
#endif
11391141
}
11401142

runtime/vm/service.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4889,6 +4889,12 @@ void Service::PrintJSONForVM(JSONStream* js, bool ref) {
48894889
jsobj.AddProperty("operatingSystem", OS::Name());
48904890
jsobj.AddProperty("targetCPU", CPU::Id());
48914891
jsobj.AddProperty("version", Version::String());
4892+
#if defined(DART_PRECOMPILED_RUNTIME)
4893+
Snapshot::Kind kind = Snapshot::kFullAOT;
4894+
#else
4895+
Snapshot::Kind kind = Snapshot::kFullJIT;
4896+
#endif
4897+
jsobj.AddProperty("_features", Dart::FeaturesString(nullptr, true, kind));
48924898
jsobj.AddProperty("_profilerMode", FLAG_profile_vm ? "VM" : "Dart");
48934899
jsobj.AddProperty64("_nativeZoneMemoryUsage",
48944900
ApiNativeScope::current_memory_usage());

0 commit comments

Comments
 (0)