Skip to content

Commit 82f52c3

Browse files
committed
Work around macOS dart:io posix_spawn hang in dt
Only forward dt's stdin to child processes when stdin is a terminal. On CI, stdin is /dev/null. package:io's sharedStdIn reads it to EOF, which makes dart:io close fd 0. With the posix_spawn-based macOS process implementation (Dart SDK commit 0171629a5478), spawning children after fd 0 is closed breaks their stdio, so nested dt invocations (e.g. `dt pub-get` under `dt generate-code`) hang forever waiting on a child that already exited. This hung every macOS CI job with the new Flutter candidate. See dart-lang/sdk#64744.
1 parent b62df22 commit 82f52c3

17 files changed

Lines changed: 50 additions & 31 deletions

‎tool/bin/dt.dart‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@ import 'dart:io';
66

77
import 'package:args/command_runner.dart';
88
import 'package:devtools_tool/devtools_command_runner.dart';
9+
import 'package:devtools_tool/utils.dart';
910
import 'package:io/io.dart';
1011

1112
void main(List<String> args) async {
1213
final runner = DevToolsCommandRunner();
1314
try {
14-
final dynamic result = await runner
15-
.run(args)
16-
.whenComplete(sharedStdIn.terminate);
15+
final dynamic result = await runner.run(args).whenComplete(() async {
16+
// Only touch [sharedStdIn] if it may have been used. Accessing it starts
17+
// listening to stdin, which we must avoid when stdin is not a terminal.
18+
// See [shouldForwardStdin].
19+
if (shouldForwardStdin) await sharedStdIn.terminate();
20+
});
1721

1822
exit(result is int ? result : 0);
1923
} catch (e, st) {

‎tool/lib/commands/analyze.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66

77
import 'package:args/command_runner.dart';
88
import 'package:cli_util/cli_logging.dart';
9-
import 'package:io/io.dart';
109

1110
import '../model.dart';
1211
import '../utils.dart';
@@ -45,7 +44,7 @@ class AnalyzeCommand extends Command {
4544
Future run() async {
4645
final log = Logger.standard();
4746
final repo = DevToolsRepo.getInstance();
48-
final processManager = ProcessManager();
47+
final processManager = createProcessManager();
4948
final skipUnimportant = argResults![_skipUnimportantArg] as bool;
5049
final packages = repo.getPackages(
5150
skip: skipUnimportant ? _unimportantDirectories : [],

‎tool/lib/commands/build.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:io';
77
import 'package:args/command_runner.dart';
88
import 'package:devtools_tool/commands/shared.dart';
99
import 'package:devtools_tool/model.dart';
10-
import 'package:io/io.dart';
1110
import 'package:path/path.dart' as path;
1211

1312
import '../utils.dart';
@@ -58,7 +57,7 @@ class BuildCommand extends Command {
5857
@override
5958
Future run() async {
6059
final repo = DevToolsRepo.getInstance();
61-
final processManager = ProcessManager();
60+
final processManager = createProcessManager();
6261
final results = argResults!;
6362
final updateFlutter =
6463
results[SharedCommandArgs.updateFlutter.flagName] as bool;

‎tool/lib/commands/fix_goldens.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:io';
77

88
import 'package:args/command_runner.dart';
9-
import 'package:io/io.dart';
109
import 'package:path/path.dart' as path;
1110

1211
import '../utils.dart';
@@ -32,7 +31,7 @@ class FixGoldensCommand extends Command {
3231
@override
3332
String get name => 'fix-goldens';
3433

35-
final processManager = ProcessManager();
34+
final processManager = createProcessManager();
3635

3736
@override
3837
FutureOr? run() async {

‎tool/lib/commands/generate_code.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:args/command_runner.dart';
66
import 'package:devtools_tool/model.dart';
7-
import 'package:io/io.dart';
87
import 'package:path/path.dart' as path;
98

109
import '../utils.dart';
@@ -40,7 +39,7 @@ class GenerateCodeCommand extends Command {
4039
@override
4140
Future run() async {
4241
final repo = DevToolsRepo.getInstance();
43-
final processManager = ProcessManager();
42+
final processManager = createProcessManager();
4443

4544
Future<void> runOverPackages(
4645
CliCommand command, {

‎tool/lib/commands/presubmit.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class PresubmitCommand extends Command {
3737
Future run() async {
3838
final log = Logger.standard();
3939
final repo = DevToolsRepo.getInstance();
40-
final pm = processManager ?? ProcessManager();
40+
final pm = processManager ?? createProcessManager();
4141
final fix = argResults!['fix'] as bool;
4242

4343
log.stdout('Running pub get...');

‎tool/lib/commands/pub_get.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66

77
import 'package:args/command_runner.dart';
88
import 'package:cli_util/cli_logging.dart';
9-
import 'package:io/io.dart';
109
import 'package:path/path.dart' as path;
1110

1211
import '../model.dart';
@@ -38,7 +37,7 @@ class PubGetCommand extends Command {
3837
Future run() async {
3938
final log = Logger.standard();
4039
final repo = DevToolsRepo.getInstance();
41-
final processManager = ProcessManager();
40+
final processManager = createProcessManager();
4241
final packages = repo.getPackages();
4342

4443
final upgrade = argResults![_upgradeFlag] as bool;

‎tool/lib/commands/release_helper.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ReleaseHelperCommand extends Command {
3636
@override
3737
FutureOr? run() async {
3838
final log = Logger.standard();
39-
final processManager = ProcessManager();
39+
final processManager = createProcessManager();
4040

4141
final debug = argResults![_debugFlag] as bool;
4242
final currentBranchResult = await processManager.runProcess(

‎tool/lib/commands/release_notes_helper.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:args/command_runner.dart';
99
import 'package:cli_util/cli_logging.dart';
1010
import 'package:devtools_tool/model.dart';
1111
import 'package:devtools_tool/utils.dart';
12-
import 'package:io/io.dart';
12+
import 'package:io/io.dart' show copyPath;
1313
import 'package:path/path.dart' as p;
1414

1515
class ReleaseNotesCommand extends Command {
@@ -42,7 +42,7 @@ class ReleaseNotesCommand extends Command {
4242
@override
4343
FutureOr? run() async {
4444
final log = Logger.standard();
45-
final processManager = ProcessManager();
45+
final processManager = createProcessManager();
4646

4747
final devToolsReleaseNotesDirectory = Directory(
4848
p.join(

‎tool/lib/commands/run.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:args/command_runner.dart';
66
import 'package:devtools_tool/commands/shared.dart';
7-
import 'package:io/io.dart';
87

98
import '../utils.dart';
109

@@ -30,7 +29,7 @@ class RunCommand extends Command {
3029

3130
@override
3231
Future run() async {
33-
final processManager = ProcessManager();
32+
final processManager = createProcessManager();
3433
final process = await processManager.runProcess(
3534
CliCommand.tool([
3635
'serve',

0 commit comments

Comments
 (0)