github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill leaked chrome processes (#39514)

Browse Source
This commit is contained in:
Jonah Williams 2019-08-29 14:28:37 -07:00 committed by GitHub
parent 14cec30c18
commit d2f70a6d20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 141 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/devicelab/lib/framework/running_processes.dart
View File

@ -14,7 +14,7 @@ class RunningProcessInfo {
assert(commandLine != null); assert(commandLine != null);
final String commandLine; final String commandLine;
final int pid; final String pid;
final DateTime creationDate; final DateTime creationDate;
@override @override
@ -47,7 +47,7 @@ class RunningProcessInfo {
} }
} }
Future<bool> killProcess(int pid, {ProcessManager processManager}) async { Future<bool> killProcess(String pid, {ProcessManager processManager}) async {
assert(pid != null, 'Must specify a pid to kill'); assert(pid != null, 'Must specify a pid to kill');
processManager ??= const LocalProcessManager(); processManager ??= const LocalProcessManager();
ProcessResult result; ProcessResult result;
@ -55,14 +55,14 @@ Future<bool> killProcess(int pid, {ProcessManager processManager}) async {
result = await processManager.run(<String>[ result = await processManager.run(<String>[
'taskkill.exe', 'taskkill.exe',
'/pid', '/pid',
pid.toString(), pid,
'/f', '/f',
]); ]);
} else { } else {
result = await processManager.run(<String>[ result = await processManager.run(<String>[
'kill', 'kill',
'-9', '-9',
pid.toString(), pid,
]); ]);
} }
return result.exitCode == 0; return result.exitCode == 0;
@ -163,7 +163,7 @@ Iterable<RunningProcessInfo> processPowershellOutput(String output) sync* {
time = '${hours + 12}${time.substring(2)}'; time = '${hours + 12}${time.substring(2)}';
} }
final int pid = int.parse(line.substring(0, processIdHeaderSize).trim()); final String pid = line.substring(0, processIdHeaderSize).trim();
final DateTime creationDate = DateTime.parse('$year-$month-${day}T$time'); final DateTime creationDate = DateTime.parse('$year-$month-${day}T$time');
final String commandLine = line.substring(commandLineHeaderStart).trim(); final String commandLine = line.substring(commandLineHeaderStart).trim();
yield RunningProcessInfo(pid, creationDate, commandLine); yield RunningProcessInfo(pid, creationDate, commandLine);
@ -254,7 +254,7 @@ Iterable<RunningProcessInfo> processPsOutput(
final DateTime creationDate = DateTime.parse('$year-$month-${day}T$time'); final DateTime creationDate = DateTime.parse('$year-$month-${day}T$time');
line = line.substring(24).trim(); line = line.substring(24).trim();
final int nextSpace = line.indexOf(' '); final int nextSpace = line.indexOf(' ');
final int pid = int.parse(line.substring(0, nextSpace)); final String pid = line.substring(0, nextSpace);
final String commandLine = line.substring(nextSpace + 1); final String commandLine = line.substring(nextSpace + 1);
yield RunningProcessInfo(pid, creationDate, commandLine); yield RunningProcessInfo(pid, creationDate, commandLine);
} }

238
dev/devicelab/lib/tasks/web_dev_mode_tests.dart
View File

@ -9,6 +9,7 @@ import 'dart:io';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import '../framework/framework.dart'; import '../framework/framework.dart';
import '../framework/running_processes.dart';
import '../framework/utils.dart'; import '../framework/utils.dart';
final Directory _editedFlutterGalleryDir = dir(path.join(Directory.systemTemp.path, 'edited_flutter_gallery')); final Directory _editedFlutterGalleryDir = dir(path.join(Directory.systemTemp.path, 'edited_flutter_gallery'));
@ -20,119 +21,140 @@ TaskFunction createWebDevModeTest() {
'--hot', '-d', 'chrome', '--verbose', '--resident', '--target=lib/main.dart', '--hot', '-d', 'chrome', '--verbose', '--resident', '--target=lib/main.dart',
]; ];
int hotRestartCount = 0; int hotRestartCount = 0;
await inDirectory<void>(flutterDirectory, () async { String chromeProcessName;
rmTree(_editedFlutterGalleryDir); if (Platform.isMacOS) {
mkdirs(_editedFlutterGalleryDir); chromeProcessName = 'Chrome';
recursiveCopy(flutterGalleryDir, _editedFlutterGalleryDir); } else if (Platform.isLinux) {
await inDirectory<void>(_editedFlutterGalleryDir, () async { chromeProcessName = 'chrome';
{ } else if (Platform.isWindows) {
final Process packagesGet = await startProcess( chromeProcessName = 'chrome.exe';
path.join(flutterDirectory.path, 'bin', 'flutter'), }
<String>['packages', 'get'], final Set<String> beforeChromeProcesses = await getRunningProcesses(processName: chromeProcessName)
environment: <String, String>{ .map((RunningProcessInfo info) => info.pid)
'FLUTTER_WEB': 'true', .toSet();
}, try {
); await inDirectory<void>(flutterDirectory, () async {
await packagesGet.exitCode; rmTree(_editedFlutterGalleryDir);
final Process process = await startProcess( mkdirs(_editedFlutterGalleryDir);
path.join(flutterDirectory.path, 'bin', 'flutter'), recursiveCopy(flutterGalleryDir, _editedFlutterGalleryDir);
flutterCommandArgs('run', options), await inDirectory<void>(_editedFlutterGalleryDir, () async {
environment: <String, String>{ {
'FLUTTER_WEB': 'true', final Process packagesGet = await startProcess(
}, path.join(flutterDirectory.path, 'bin', 'flutter'),
); <String>['packages', 'get'],
environment: <String, String>{
'FLUTTER_WEB': 'true',
},
);
await packagesGet.exitCode;
final Process process = await startProcess(
path.join(flutterDirectory.path, 'bin', 'flutter'),
flutterCommandArgs('run', options),
environment: <String, String>{
'FLUTTER_WEB': 'true',
},
);
final Completer<void> stdoutDone = Completer<void>(); final Completer<void> stdoutDone = Completer<void>();
final Completer<void> stderrDone = Completer<void>(); final Completer<void> stderrDone = Completer<void>();
process.stdout process.stdout
.transform<String>(utf8.decoder) .transform<String>(utf8.decoder)
.transform<String>(const LineSplitter()) .transform<String>(const LineSplitter())
.listen((String line) { .listen((String line) {
if (line.contains('To hot restart')) { if (line.contains('To hot restart')) {
process.stdin.write('R'); process.stdin.write('R');
} }
if (line.contains('Restarted')) { if (line.contains('Restarted')) {
if (hotRestartCount == 0) { if (hotRestartCount == 0) {
// Update the file and reload again. // Update the file and reload again.
final File appDartSource = file(path.join( final File appDartSource = file(path.join(
_editedFlutterGalleryDir.path, 'lib/gallery/app.dart', _editedFlutterGalleryDir.path, 'lib/gallery/app.dart',
)); ));
appDartSource.writeAsStringSync( appDartSource.writeAsStringSync(
appDartSource.readAsStringSync().replaceFirst( appDartSource.readAsStringSync().replaceFirst(
"'Flutter Gallery'", "'Updated Flutter Gallery'", "'Flutter Gallery'", "'Updated Flutter Gallery'",
) )
); );
process.stdin.writeln('R'); process.stdin.writeln('R');
++hotRestartCount; ++hotRestartCount;
} else { } else {
// Quit after second hot restart. // Quit after second hot restart.
process.stdin.writeln('q');
}
}
print('stdout: $line');
}, onDone: () {
stdoutDone.complete();
});
process.stderr
.transform<String>(utf8.decoder)
.transform<String>(const LineSplitter())
.listen((String line) {
print('stderr: $line');
}, onDone: () {
stderrDone.complete();
});
await Future.wait<void>(<Future<void>>[
stdoutDone.future,
stderrDone.future,
]);
await process.exitCode;
}
// Start `flutter run` again to make sure it loads from the previous
// state. dev compilers loads up from previously compiled JavaScript.
{
final Process process = await startProcess(
path.join(flutterDirectory.path, 'bin', 'flutter'),
flutterCommandArgs('run', options),
environment: <String, String>{
'FLUTTER_WEB': 'true',
},
);
final Completer<void> stdoutDone = Completer<void>();
final Completer<void> stderrDone = Completer<void>();
process.stdout
.transform<String>(utf8.decoder)
.transform<String>(const LineSplitter())
.listen((String line) {
if (line.contains('To hot restart')) {
process.stdin.write('R');
}
if (line.contains('Restarted')) {
process.stdin.writeln('q'); process.stdin.writeln('q');
} }
} print('stdout: $line');
print('stdout: $line'); }, onDone: () {
}, onDone: () { stdoutDone.complete();
stdoutDone.complete(); });
}); process.stderr
process.stderr .transform<String>(utf8.decoder)
.transform<String>(utf8.decoder) .transform<String>(const LineSplitter())
.transform<String>(const LineSplitter()) .listen((String line) {
.listen((String line) { print('stderr: $line');
print('stderr: $line'); }, onDone: () {
}, onDone: () { stderrDone.complete();
stderrDone.complete(); });
});
await Future.wait<void>(<Future<void>>[ await Future.wait<void>(<Future<void>>[
stdoutDone.future, stdoutDone.future,
stderrDone.future, stderrDone.future,
]); ]);
await process.exitCode; await process.exitCode;
}
} });
// Start `flutter run` again to make sure it loads from the previous
// state. dev compilers loads up from previously compiled JavaScript.
{
final Process process = await startProcess(
path.join(flutterDirectory.path, 'bin', 'flutter'),
flutterCommandArgs('run', options),
environment: <String, String>{
'FLUTTER_WEB': 'true',
},
);
final Completer<void> stdoutDone = Completer<void>();
final Completer<void> stderrDone = Completer<void>();
process.stdout
.transform<String>(utf8.decoder)
.transform<String>(const LineSplitter())
.listen((String line) {
if (line.contains('To hot restart')) {
process.stdin.write('R');
}
if (line.contains('Restarted')) {
process.stdin.writeln('q');
}
print('stdout: $line');
}, onDone: () {
stdoutDone.complete();
});
process.stderr
.transform<String>(utf8.decoder)
.transform<String>(const LineSplitter())
.listen((String line) {
print('stderr: $line');
}, onDone: () {
stderrDone.complete();
});
await Future.wait<void>(<Future<void>>[
stdoutDone.future,
stderrDone.future,
]);
await process.exitCode;
}
}); });
}); } finally {
final Set<String> afterChromeProcesses = await getRunningProcesses(processName: chromeProcessName)
.map((RunningProcessInfo info) => info.pid)
.toSet();
final Set<String> newProcesses = afterChromeProcesses.difference(beforeChromeProcesses);
for (String processId in newProcesses) {
await killProcess(processId);
}
}
if (hotRestartCount != 1) { if (hotRestartCount != 1) {
return TaskResult.failure(null); return TaskResult.failure(null);
} }

10
dev/devicelab/test/running_processes_test.dart
View File

@ -24,17 +24,17 @@ ProcessId CreationDate CommandLine
results, results,
equals(<RunningProcessInfo>[ equals(<RunningProcessInfo>[
RunningProcessInfo( RunningProcessInfo(
6552, '6552',
DateTime(2019, 7, 3, 17, 0, 27), DateTime(2019, 7, 3, 17, 0, 27),
r'"C:\tools\dart-sdk\bin\dart.exe" .\bin\agent.dart ci', r'"C:\tools\dart-sdk\bin\dart.exe" .\bin\agent.dart ci',
), ),
RunningProcessInfo( RunningProcessInfo(
6553, '6553',
DateTime(2019, 7, 3, 22, 0, 27), DateTime(2019, 7, 3, 22, 0, 27),
r'"C:\tools\dart-sdk1\bin\dart.exe" .\bin\agent.dart ci', r'"C:\tools\dart-sdk1\bin\dart.exe" .\bin\agent.dart ci',
), ),
RunningProcessInfo( RunningProcessInfo(
6554, '6554',
DateTime(2019, 7, 3, 11, 0, 27), DateTime(2019, 7, 3, 11, 0, 27),
r'"C:\tools\dart-sdk2\bin\dart.exe" .\bin\agent.dart ci', r'"C:\tools\dart-sdk2\bin\dart.exe" .\bin\agent.dart ci',
), ),
@ -54,12 +54,12 @@ Sat Mar 9 20:13:00 2019 49 /usr/sbin/syslogd
results, results,
equals(<RunningProcessInfo>[ equals(<RunningProcessInfo>[
RunningProcessInfo( RunningProcessInfo(
1, '1',
DateTime(2019, 3, 9, 20, 12, 47), DateTime(2019, 3, 9, 20, 12, 47),
'/sbin/launchd', '/sbin/launchd',
), ),
RunningProcessInfo( RunningProcessInfo(
49, '49',
DateTime(2019, 3, 9, 20, 13, 00), DateTime(2019, 3, 9, 20, 13, 00),
'/usr/sbin/syslogd', '/usr/sbin/syslogd',
), ),