Skip to content

Commit 6a7ae1f

Browse files
author
Dart CI
committed
Version 3.10.0-81.0.dev
Merge aba11d0 into dev
2 parents 91cbf6d + aba11d0 commit 6a7ae1f

24 files changed

+178
-525
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ vars = {
8484
"download_reclient": True,
8585

8686
# Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
87-
"fuchsia_sdk_version": "version:29.20250731.5.1",
87+
"fuchsia_sdk_version": "version:29.20250804.4.1",
8888
"download_fuchsia_deps": False,
8989

9090
# Ninja, runs the build based on files generated by GN.

‎pkg/analyzer/lib/src/dart/analysis/driver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ testFineAfterLibraryAnalyzerHook;
109109
// TODO(scheglov): Clean up the list of implicitly analyzed files.
110110
class AnalysisDriver {
111111
/// The version of data format, should be incremented on every format change.
112-
static const int DATA_VERSION = 511;
112+
static const int DATA_VERSION = 512;
113113

114114
/// The number of exception contexts allowed to write. Once this field is
115115
/// zero, we stop writing any new exception contexts in this process.

‎pkg/analyzer/lib/src/summary2/informative_data.dart

Lines changed: 82 additions & 87 deletions
Large diffs are not rendered by default.

‎pkg/analyzer/test/src/summary/elements/library_import_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ library
556556
#F0 <testLibraryFragment>
557557
element: <testLibrary>
558558
libraryImports
559-
dart:math as <null-name> (nameOffset:<null>) (firstTokenOffset:<null>) (offset:21)
559+
dart:math as <null-name> (nameOffset:<null>) (firstTokenOffset:<null>) (offset:0)
560560
prefixes
561561
<testLibraryFragment>::@prefix2::0
562562
fragments: @null

‎pkg/dds/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 5.1.0
2+
- Update to version 2.1 of the DDS protocol.
3+
- Deprecate `getAvailableCachedCpuSamples` and `getCachedCpuSamples` RPCs.
4+
- Deprecate the `cachedUserTags` parameter of `DartDevelopmentService.startDartDevelopmentService`.
5+
- Deprecate the `DartDevelopmentService.cachedUserTags` getter.
6+
17
# 5.0.5
28
- [DAP] The change in DDS 5.0.4 to individually add/remove breakpoints has been reverted and may be restored in a future version.
39

‎pkg/dds/dds_protocol.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Dart Development Service Protocol 2.0
1+
# Dart Development Service Protocol 2.1
22

3-
This document describes _version 2.0_ of the Dart Development Service Protocol.
3+
This document describes _version 2.1_ of the Dart Development Service Protocol.
44
This protocol is an extension of the Dart VM Service Protocol and implements it
55
in it's entirety. For details on the VM Service Protocol, see the [Dart VM Service Protocol Specification][service-protocol].
66

@@ -83,9 +83,9 @@ The DDS Protocol supports all [public RPCs defined in the VM Service protocol][s
8383
AvailableCachedCpuSamples getAvailableCachedCpuSamples();
8484
```
8585

86-
The _getAvailableCachedCpuSamples_ RPC is used to determine which caches of CPU samples
87-
are available. Caches are associated with individual _UserTag_ names and are specified
88-
when DDS is started via the _cachedUserTags_ parameter.
86+
The _getAvailableCachedCpuSamples_ RPC is deprecated and will always return an
87+
_AvailableCachedCpuSamples_ object containing a single property named
88+
_cacheNames_ with an empty array as its value.
8989

9090
See [AvailableCachedCpuSamples](#availablecachedcpusamples).
9191

@@ -95,8 +95,9 @@ See [AvailableCachedCpuSamples](#availablecachedcpusamples).
9595
CachedCpuSamples getCachedCpuSamples(string isolateId, string userTag);
9696
```
9797

98-
The _getCachedCpuSamples_ RPC is used to retrieve a cache of CPU samples collected
99-
under a _UserTag_ with name _userTag_.
98+
The _getCachedCpuSamples_ RPC is deprecated and will always return a
99+
_CachedCpuSamples_ object containing properties with meaningless placeholder
100+
values.
100101

101102
See [CachedCpuSamples](#cachedcpusamples).
102103

@@ -357,6 +358,7 @@ version | comments
357358
1.4 | Added the ability to subscribe to custom streams (which can be specified when calling `dart:developer`'s `postEvent`).
358359
1.5 | Added `getPerfettoCpuSamples` RPC.
359360
1.6 | Added `postEvent` RPC.
361+
2.1 | Deprecated `getAvailableCachedCpuSamples` and `getCachedCpuSamples` RPCs.
360362

361363
[resume]: https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md#resume
362364
[success]: https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md#success

‎pkg/dds/lib/dds.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ abstract class DartDevelopmentService {
5050
bool enableAuthCodes = true,
5151
bool ipv6 = false,
5252
bool enableServicePortFallback = false,
53+
@Deprecated(
54+
'This parameter is deprecated and supplying an argument to it will cause '
55+
'no effect.',
56+
)
5357
List<String> cachedUserTags = const [],
5458
DevToolsConfiguration? devToolsConfiguration,
5559
bool logRequests = false,
@@ -89,7 +93,6 @@ abstract class DartDevelopmentService {
8993
remoteVmServiceUri,
9094
serviceUri,
9195
enableAuthCodes,
92-
cachedUserTags,
9396
ipv6,
9497
devToolsConfiguration,
9598
logRequests,
@@ -162,13 +165,14 @@ abstract class DartDevelopmentService {
162165
/// requests.
163166
bool get isRunning;
164167

165-
/// The list of [UserTag]s used to determine which CPU samples are cached by
166-
/// DDS.
168+
@Deprecated(
169+
'This getter is deprecated and will always return an empty list.',
170+
)
167171
List<String> get cachedUserTags;
168172

169173
/// The version of the DDS protocol supported by this [DartDevelopmentService]
170174
/// instance.
171-
static const String protocolVersion = '2.0';
175+
static const String protocolVersion = '2.1';
172176
}
173177

174178
/// Thrown by DDS during initialization failures, unexpected connection issues,

‎pkg/dds/lib/dds_launcher.dart

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import 'src/dds_impl.dart';
3939
/// If [enableServicePortFallback] is enabled, DDS will attempt to bind to any
4040
/// available port if the specified port is unavailable.
4141
///
42-
/// If set, the set of [cachedUserTags] will be used to determine which CPU
43-
/// samples should be cached by DDS.
42+
/// [cachedUserTags] is deprecated and supplying an argument to it will cause no
43+
/// effect.
4444
///
4545
/// If provided, [dartExecutable] is the path to the 'dart' executable that
4646
/// should be used to spawn the DDS instance. By default, `Platform.executable`
@@ -60,18 +60,16 @@ class DartDevelopmentServiceLauncher {
6060
var args = <String>[
6161
'--${DartDevelopmentServiceOptions.vmServiceUriOption}=$remoteVmServiceUri',
6262
if (serviceUri != null) ...<String>[
63-
'--${DartDevelopmentServiceOptions.bindAddressOption}=${serviceUri.host}', '--${DartDevelopmentServiceOptions.bindPortOption}=${serviceUri.port}',
63+
'--${DartDevelopmentServiceOptions.bindAddressOption}=${serviceUri.host}',
64+
'--${DartDevelopmentServiceOptions.bindPortOption}=${serviceUri.port}',
6465
],
6566
if (!enableAuthCodes)
6667
'--${DartDevelopmentServiceOptions.disableServiceAuthCodesFlag}',
67-
if (serveDevTools)
68-
'--${DartDevelopmentServiceOptions.serveDevToolsFlag}',
68+
if (serveDevTools) '--${DartDevelopmentServiceOptions.serveDevToolsFlag}',
6969
if (devToolsServerAddress != null)
7070
'--${DartDevelopmentServiceOptions.devToolsServerAddressOption}=$devToolsServerAddress',
7171
if (enableServicePortFallback)
7272
'--${DartDevelopmentServiceOptions.enableServicePortFallbackFlag}',
73-
for (final String tag in cachedUserTags)
74-
'--${DartDevelopmentServiceOptions.cachedUserTagsOption}=$tag',
7573
if (google3WorkspaceRoot != null)
7674
'--${DartDevelopmentServiceOptions.google3WorkspaceRootOption}=$google3WorkspaceRoot',
7775
];

‎pkg/dds/lib/src/arg_parser.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ abstract class DartDevelopmentServiceOptions {
7575
)
7676
..addMultiOption(
7777
cachedUserTagsOption,
78-
help: 'A set of UserTag names used to determine which CPU samples are '
79-
'cached by DDS.',
78+
help: 'This option is deprecated and supplying it will cause no '
79+
'effect.',
8080
defaultsTo: <String>[],
8181
)
8282
..addOption(

‎pkg/dds/lib/src/client.dart

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class DartDevelopmentServiceClient {
265265
'getAvailableCachedCpuSamples',
266266
(_) => {
267267
'type': 'AvailableCachedCpuSamples',
268-
'cacheNames': dds.cachedUserTags,
268+
'cacheNames': <String>[],
269269
},
270270
);
271271

@@ -286,7 +286,18 @@ class DartDevelopmentServiceClient {
286286

287287
_clientPeer.registerMethod(
288288
'getCachedCpuSamples',
289-
dds.isolateManager.getCachedCpuSamples,
289+
(_) => {
290+
'type': 'CachedCpuSamples',
291+
'userTag': '',
292+
'samplePeriod': -1,
293+
'maxStackDepth': -1,
294+
'sampleCount': -1,
295+
'timeOriginMicros': -1,
296+
'timeExtentMicros': -1,
297+
'pid': -1,
298+
'functions': [],
299+
'samples': [],
300+
},
290301
);
291302

292303
_clientPeer.registerMethod(

0 commit comments

Comments
 (0)