Skip to content

Commit 26d1f3d

Browse files
derekxu16Commit Queue
authored andcommitted
Revert "[VM/Service] Record timeline events representing completed microtasks"
This reverts commit 22021cc. Reason for revert: I didn't gate stacktrace collection behind `--profile-microtasks` correctly Original change's description: > [VM/Service] Record timeline events representing completed microtasks > > TEST=pkg/vm_service/test/timeline_events_for_completed_microtasks_test > > CoreLibraryReviewExempt: This CL does not include any core library API > changes, it only modifies the implementation of microtasks (by > instrumenting them). > Change-Id: I54d886db9519c73f9e3218a9cc1c46bc9fe9acc3 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420221 > Commit-Queue: Derek Xu <[email protected]> > Reviewed-by: Ben Konyi <[email protected]> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I82b4a49764956254c51bd3abfee0cb3cd1b329d2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423920 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Jessy Yameogo <[email protected]> Commit-Queue: Jessy Yameogo <[email protected]> Auto-Submit: Derek Xu <[email protected]>
1 parent 326e32a commit 26d1f3d

12 files changed

+18
-354
lines changed

pkg/vm_service/test/common/service_test_common.dart

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
library service_test_common;
66

77
import 'dart:async';
8-
import 'dart:collection' show HashMap;
98
import 'dart:typed_data';
109

1110
import 'package:path/path.dart' as p;
1211
import 'package:test/test.dart';
1312
import 'package:vm_service/vm_service.dart';
14-
import 'package:vm_service_protos/vm_service_protos.dart' show DebugAnnotation;
1513

1614
typedef IsolateTest = Future<void> Function(
1715
VmService service,
@@ -916,19 +914,3 @@ IsolateTest testExpressionEvaluationAndAvailableVariables(
916914
}
917915
};
918916
}
919-
920-
Map<String, String> mapFromListOfDebugAnnotations(
921-
List<DebugAnnotation> debugAnnotations,
922-
) {
923-
return HashMap.fromEntries(
924-
debugAnnotations.map((a) {
925-
if (a.hasStringValue()) {
926-
return MapEntry(a.name, a.stringValue);
927-
} else if (a.hasLegacyJsonValue()) {
928-
return MapEntry(a.name, a.legacyJsonValue);
929-
} else {
930-
throw 'We should not be writing annotations without values';
931-
}
932-
}),
933-
);
934-
}

pkg/vm_service/test/get_perfetto_vm_timeline_rpc_test.dart

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// VMOptions=
66
// VMOptions=--intern_strings_when_writing_perfetto_timeline
77

8+
import 'dart:collection';
89
import 'dart:convert';
910
import 'dart:developer';
1011
import 'dart:io' show Platform;
@@ -13,7 +14,6 @@ import 'package:test/test.dart';
1314
import 'package:vm_service/vm_service.dart' hide Timeline;
1415
import 'package:vm_service_protos/vm_service_protos.dart';
1516

16-
import 'common/service_test_common.dart' show mapFromListOfDebugAnnotations;
1717
import 'common/test_helper.dart';
1818

1919
void primeTimeline() {
@@ -143,6 +143,22 @@ List<TrackEvent> extractTrackEventsFromTracePackets(
143143
return result;
144144
}
145145

146+
Map<String, String> mapFromListOfDebugAnnotations(
147+
List<DebugAnnotation> debugAnnotations,
148+
) {
149+
return HashMap.fromEntries(
150+
debugAnnotations.map((a) {
151+
if (a.hasStringValue()) {
152+
return MapEntry(a.name, a.stringValue);
153+
} else if (a.hasLegacyJsonValue()) {
154+
return MapEntry(a.name, a.legacyJsonValue);
155+
} else {
156+
throw 'We should not be writing annotations without values';
157+
}
158+
}),
159+
);
160+
}
161+
146162
void checkThatAllEventsHaveIsolateNumbers(Iterable<TrackEvent> events) {
147163
for (final event in events) {
148164
final debugAnnotations =

pkg/vm_service/test/timeline_events_for_completed_microtasks_test.dart

Lines changed: 0 additions & 64 deletions
This file was deleted.

runtime/lib/async.cc

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
#include "vm/bootstrap_natives.h"
66
#include "vm/debugger.h"
77
#include "vm/exceptions.h"
8-
#include "vm/flags.h"
9-
#include "vm/microtask_mirror_queues.h"
108
#include "vm/native_entry.h"
119
#include "vm/object_store.h"
1210
#include "vm/runtime_entry.h"
1311

1412
namespace dart {
1513

16-
// This flag is defined in "vm/microtask_mirror_queues.cc".
17-
DECLARE_FLAG(bool, profile_microtasks);
18-
1914
DEFINE_NATIVE_ENTRY(AsyncStarMoveNext_debuggerStepCheck, 0, 1) {
2015
#if !defined(PRODUCT)
2116
GET_NON_NULL_NATIVE_ARGUMENT(Closure, generator, arguments->NativeArgAt(0));
@@ -61,41 +56,4 @@ DEFINE_NATIVE_ENTRY(SuspendState_instantiateClosureWithFutureTypeArgument,
6156
return closure.ptr();
6257
}
6358

64-
DEFINE_NATIVE_ENTRY(MicrotaskMirrorQueue_onScheduleAsyncCallback, 0, 1) {
65-
#if !defined(PRODUCT)
66-
if (FLAG_profile_microtasks) {
67-
GET_NON_NULL_NATIVE_ARGUMENT(StackTrace, stack_trace,
68-
arguments->NativeArgAt(0));
69-
MicrotaskMirrorQueues::GetQueue(static_cast<int64_t>(isolate->main_port()))
70-
->OnScheduleAsyncCallback(stack_trace);
71-
}
72-
#endif // !defined(PRODUCT)
73-
return Object::null();
74-
}
75-
76-
DEFINE_NATIVE_ENTRY(MicrotaskMirrorQueue_onSchedulePriorityAsyncCallback,
77-
0,
78-
0) {
79-
#if !defined(PRODUCT)
80-
if (FLAG_profile_microtasks) {
81-
MicrotaskMirrorQueues::GetQueue(static_cast<int64_t>(isolate->main_port()))
82-
->OnSchedulePriorityAsyncCallback();
83-
}
84-
#endif // !defined(PRODUCT)
85-
return Object::null();
86-
}
87-
88-
DEFINE_NATIVE_ENTRY(MicrotaskMirrorQueue_onAsyncCallbackComplete, 0, 2) {
89-
#if !defined(PRODUCT)
90-
if (FLAG_profile_microtasks) {
91-
GET_NON_NULL_NATIVE_ARGUMENT(Integer, start_time,
92-
arguments->NativeArgAt(0));
93-
GET_NON_NULL_NATIVE_ARGUMENT(Integer, end_time, arguments->NativeArgAt(1));
94-
MicrotaskMirrorQueues::GetQueue(static_cast<int64_t>(isolate->main_port()))
95-
->OnAsyncCallbackComplete(start_time.Value(), end_time.Value());
96-
}
97-
#endif // !defined(PRODUCT)
98-
return Object::null();
99-
}
100-
10159
} // namespace dart

runtime/vm/bootstrap_natives.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ namespace dart {
149149
V(Timeline_getTraceClock, 0) \
150150
V(Timeline_isDartStreamEnabled, 0) \
151151
V(Timeline_reportTaskEvent, 5) \
152-
V(MicrotaskMirrorQueue_onScheduleAsyncCallback, 1) \
153-
V(MicrotaskMirrorQueue_onSchedulePriorityAsyncCallback, 0) \
154-
V(MicrotaskMirrorQueue_onAsyncCallbackComplete, 2) \
155152
V(TypedDataBase_length, 1) \
156153
V(TypedDataBase_setClampedRange, 5) \
157154
V(TypedData_GetFloat32, 2) \

runtime/vm/dart.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "vm/kernel_isolate.h"
3434
#include "vm/message_handler.h"
3535
#include "vm/metrics.h"
36-
#include "vm/microtask_mirror_queues.h"
3736
#include "vm/native_entry.h"
3837
#include "vm/native_message_handler.h"
3938
#include "vm/object.h"
@@ -765,7 +764,6 @@ char* Dart::Cleanup() {
765764
}
766765
Timeline::Cleanup();
767766
#endif
768-
NOT_IN_PRODUCT(MicrotaskMirrorQueues::CleanUp());
769767
Zone::Cleanup();
770768
Random::Cleanup();
771769
// Delete the current thread's TLS and set it's TLS to null.

runtime/vm/microtask_mirror_queues.cc

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)