Revert "[ VM / Service ] Add setIsolatePauseMode RPC"

This reverts commit cad8a34.

Reason for revert: broke the g3 cbuild, see cbuild logs
(Error: The method 'setIsolatePauseMode' isn't defined for the class 'VmServiceInterface')

Original change's description:
> [ VM / Service ] Add setIsolatePauseMode RPC
>
> Allows for service clients to set pause behaviors on a per-isolate
> basis at runtime. setIsolatePauseMode is a more general version of
> setExceptionPauseMode and setExceptionPauseMode has been marked as deprecated.
>
> TEST=pause_on_exceptions_*_test.dart,should_pause_on_exit_test.dart
>
> Change-Id: I09d80aa2123791dd74d02441c162c19cc0486955
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/219580
> Commit-Queue: Ben Konyi <[email protected]>
> Reviewed-by: Siva Annamalai <[email protected]>

[email protected],[email protected],[email protected]

Change-Id: Ic326c54e0fd682e382bd70e36d87467d4148c990
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/220067
Reviewed-by: Siva Annamalai <[email protected]>
Commit-Queue: Siva Annamalai <[email protected]>

Author: a-siva

pkg/dds/lib/src/dap/isolate_manager.dart

@@ -581,10 +581,7 @@ class IsolateManager {
       return;
     }
 
-    await service.setIsolatePauseMode(
-      isolate.id!,
-      exceptionPauseMode: _exceptionPauseMode,
-    );
+    await service.setExceptionPauseMode(isolate.id!, _exceptionPauseMode);
   }
 
   /// Calls setLibraryDebuggable for all libraries in the given isolate based

pkg/dds/pubspec.yaml

@@ -25,7 +25,7 @@ dependencies:
   shelf_web_socket: ^1.0.0
   sse: ^4.0.0
   stream_channel: ^2.0.0
-  vm_service: ^7.5.0
+  vm_service: ^7.2.0
   web_socket_channel: ^2.0.0
 
 dev_dependencies:

pkg/vm_service/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 7.5.0
-- Update to version `3.53` of the spec.
-- Added `setIsolatePauseMode` RPC.
-- Deprecated `setExceptionPauseMode` in favor of `setIsolatePauseMode`.
-
 ## 7.4.0
 - Update to version `3.52` of the spec.
 - Added `lookupResolvedPackageUris` and `lookupPackageUris` RPCs and `UriList`

pkg/vm_service/java/.gitignore

@@ -36,7 +36,6 @@ src/org/dartlang/vm/service/consumer/RequestHeapSnapshotConsumer.java
 src/org/dartlang/vm/service/consumer/ResumeConsumer.java
 src/org/dartlang/vm/service/consumer/SetExceptionPauseModeConsumer.java
 src/org/dartlang/vm/service/consumer/SetFlagConsumer.java
-src/org/dartlang/vm/service/consumer/SetIsolatePauseModeConsumer.java
 src/org/dartlang/vm/service/consumer/SetLibraryDebuggableConsumer.java
 src/org/dartlang/vm/service/consumer/SetNameConsumer.java
 src/org/dartlang/vm/service/consumer/SetTraceClassAllocationConsumer.java

pkg/vm_service/java/version.properties

@@ -1 +1 @@
-version=3.53
+version=3.52

pkg/vm_service/lib/src/vm_service.dart

@@ -26,7 +26,7 @@ export 'snapshot_graph.dart'
         HeapSnapshotObjectNoData,
         HeapSnapshotObjectNullData;
 
-const String vmServiceVersion = '3.53.0';
+const String vmServiceVersion = '3.52.0';
 
 /// @optional
 const String optional = 'optional';
@@ -236,7 +236,6 @@ Map<String, List<String>> _methodReturnTypes = {
   'resume': const ['Success'],
   'setBreakpointState': const ['Breakpoint'],
   'setExceptionPauseMode': const ['Success'],
-  'setIsolatePauseMode': const ['Success'],
   'setFlag': const ['Success', 'Error'],
   'setLibraryDebuggable': const ['Success'],
   'setName': const ['Success'],
@@ -1079,34 +1078,9 @@ abstract class VmServiceInterface {
   ///
   /// This method will throw a [SentinelException] in the case a [Sentinel] is
   /// returned.
-  @Deprecated('Use setIsolatePauseMode instead')
   Future<Success> setExceptionPauseMode(
       String isolateId, /*ExceptionPauseMode*/ String mode);
 
-  /// The `setIsolatePauseMode` RPC is used to control if or when an isolate
-  /// will pause due to a change in execution state.
-  ///
-  /// The `shouldPauseOnExit` parameter specify whether the target isolate
-  /// should pause on exit.
-  ///
-  /// The `setExceptionPauseMode` RPC is used to control if an isolate pauses
-  /// when an exception is thrown.
-  ///
-  /// mode | meaning
-  /// ---- | -------
-  /// None | Do not pause isolate on thrown exceptions
-  /// Unhandled | Pause isolate on unhandled exceptions
-  /// All  | Pause isolate on all thrown exceptions
-  ///
-  /// If `isolateId` refers to an isolate which has exited, then the `Collected`
-  /// [Sentinel] is returned.
-  ///
-  /// This method will throw a [SentinelException] in the case a [Sentinel] is
-  /// returned.
-  Future<Success> setIsolatePauseMode(String isolateId,
-      {/*ExceptionPauseMode*/ String? exceptionPauseMode,
-      bool? shouldPauseOnExit});
-
   /// The `setFlag` RPC is used to set a VM flag at runtime. Returns an error if
   /// the named flag does not exist, the flag may not be set at runtime, or the
   /// value is of the wrong type for the flag.
@@ -1127,7 +1101,6 @@ abstract class VmServiceInterface {
   /// provided value. If set to false when the profiler is already running, the
   /// profiler will be stopped but may not free its sample buffer depending on
   /// platform limitations.
-  /// - Isolate pause settings will only be applied to newly spawned isolates.
   ///
   /// See [Success].
   ///
@@ -1576,19 +1549,11 @@ class VmServerConnection {
           );
           break;
         case 'setExceptionPauseMode':
-          // ignore: deprecated_member_use_from_same_package
           response = await _serviceImplementation.setExceptionPauseMode(
             params!['isolateId'],
             params['mode'],
           );
           break;
-        case 'setIsolatePauseMode':
-          response = await _serviceImplementation.setIsolatePauseMode(
-            params!['isolateId'],
-            exceptionPauseMode: params['exceptionPauseMode'],
-            shouldPauseOnExit: params['shouldPauseOnExit'],
-          );
-          break;
         case 'setFlag':
           response = await _serviceImplementation.setFlag(
             params!['name'],
@@ -2116,23 +2081,11 @@ class VmService implements VmServiceInterface {
         'enable': enable
       });
 
-  @Deprecated('Use setIsolatePauseMode instead')
   @override
   Future<Success> setExceptionPauseMode(
           String isolateId, /*ExceptionPauseMode*/ String mode) =>
       _call('setExceptionPauseMode', {'isolateId': isolateId, 'mode': mode});
 
-  @override
-  Future<Success> setIsolatePauseMode(String isolateId,
-          {/*ExceptionPauseMode*/ String? exceptionPauseMode,
-          bool? shouldPauseOnExit}) =>
-      _call('setIsolatePauseMode', {
-        'isolateId': isolateId,
-        if (exceptionPauseMode != null)
-          'exceptionPauseMode': exceptionPauseMode,
-        if (shouldPauseOnExit != null) 'shouldPauseOnExit': shouldPauseOnExit,
-      });
-
   @override
   Future<Response> setFlag(String name, String value) =>
       _call('setFlag', {'name': name, 'value': value});

pkg/vm_service/pubspec.yaml

@@ -3,7 +3,7 @@ description: >-
   A library to communicate with a service implementing the Dart VM
   service protocol.
 
-version: 7.5.0
+version: 7.4.0
 
 homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_service
 

pkg/vm_service/test/common/test_helper.dart

@@ -277,6 +277,7 @@ class _ServiceTesterRunner {
         vm = await vmServiceConnectUri(serviceWebsocketAddress);
         print('Done loading VM');
         isolate = await getFirstIsolate(vm);
+        print('Got first isolate');
       });
     });
 
@@ -334,12 +335,14 @@ class _ServiceTesterRunner {
       if (event.kind == EventKind.kIsolateRunnable) {
         print(event.isolate!.name);
         vm = await service.getVM();
+        //assert(vmIsolates.isNotEmpty);
         await subscription.cancel();
         await service.streamCancel(EventStreams.kIsolate);
         completer!.complete(event.isolate!);
         completer = null;
       }
     });
+
     await service.streamListen(EventStreams.kIsolate);
 
     // The isolate may have started before we subscribed.