Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: runtime/bin/process_patch.dart

Issue 1331033003: Add tracking of open processes to the new io resource tracking. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: address comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/observatory/tests/service/process_service_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/process_patch.dart
diff --git a/runtime/bin/process_patch.dart b/runtime/bin/process_patch.dart
index b6d40ee7a3eea18e8b8ee33fb6c0fd75f008734d..1917b468cea51a5d26d1eb2b98223dea91615600 100644
--- a/runtime/bin/process_patch.dart
+++ b/runtime/bin/process_patch.dart
@@ -176,10 +176,9 @@ class _ProcessStartStatus {
// implicit constructor.
class _ProcessImplNativeWrapper extends NativeFieldWrapperClass1 {}
-class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
- implements Process {
- // Use default Map so we keep order.
- static Map<int, _ProcessImpl> _processes = new Map<int, _ProcessImpl>();
+class _ProcessImpl extends _ProcessImplNativeWrapper implements Process {
+ _ProcessResourceInfo _resourceInfo;
+ static bool connectedResourceHandler = false;
_ProcessImpl(String path,
List<String> arguments,
@@ -188,7 +187,14 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
bool includeParentEnvironment,
bool runInShell,
ProcessStartMode mode) : super() {
- _processes[_serviceId] = this;
+ if (!connectedResourceHandler) {
+ registerExtension('__getProcesses',
+ _ProcessResourceInfo.getStartedProcesses);
+ registerExtension('__getProcessById',
+ _ProcessResourceInfo.getProcessInfoMapById);
+ connectedResourceHandler = true;
+ }
+
if (runInShell) {
arguments = _getShellArguments(path, arguments);
path = _getShellCommand();
@@ -267,38 +273,6 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
_started = false;
}
- String get _serviceTypePath => 'io/processes';
- String get _serviceTypeName => 'Process';
-
- Map _toJSON(bool ref) {
- var r = {
- 'id': _servicePath,
- 'type': _serviceType(ref),
- 'name': '$_path',
- 'user_name': '$_path',
- 'pid': '$pid',
- 'arguments': _arguments.join(' '),
- };
- if (ref) {
- return r;
- }
- r['started'] = _started;
- r['ended'] = _ended;
- r['path'] = _path;
- r['environment'] = _environment;
- r['workingDirectory'] = _workingDirectory == null ? '.' : _workingDirectory;
- if (_stdin._sink._nativeSocket.owner != null) {
- r['stdin'] = _stdin._sink._nativeSocket._toJSON(true);
- }
- if (_stdout._stream._nativeSocket.owner != null) {
- r['stdout'] = _stdout._stream._nativeSocket._toJSON(true);
- }
- if (_stderr._stream._nativeSocket.owner != null) {
- r['stderr'] = _stderr._stream._nativeSocket._toJSON(true);
- }
- return r;
- }
-
static String _getShellCommand() {
if (Platform.isWindows) {
return 'cmd.exe';
@@ -418,6 +392,7 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
}
_started = true;
+ _resourceInfo = new _ProcessResourceInfo(this);
// Setup an exit handler to handle internal cleanup and possible
// callback when a process terminates.
@@ -439,7 +414,7 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
_exitCode.complete(exitCode(exitDataBuffer));
// Kill stdin, helping hand if the user forgot to do it.
_stdin._sink.destroy();
- _processes.remove(_serviceId);
+ _resourceInfo.stopped();
}
exitDataBuffer.setRange(
@@ -477,6 +452,8 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
status._errorCode);
}
+ _resourceInfo = new _ProcessResourceInfo(this);
+
var result = _wait(
_stdin._sink._nativeSocket,
_stdout._stream._nativeSocket,
@@ -488,7 +465,7 @@ class _ProcessImpl extends _ProcessImplNativeWrapper with _ServiceObject
return encoding.decode(output);
}
- _processes.remove(_serviceId);
+ _resourceInfo.stopped();
return new ProcessResult(
result[0],
« no previous file with comments | « no previous file | runtime/observatory/tests/service/process_service_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698