public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Intercept SIGCHLD to prevent accept() from waiting forever if QEMU

Browse Source 
dies before connecting to the monitor.

svn path=/nixos/branches/boot-order/; revision=22328
This commit is contained in:
Eelco Dolstra 2010-06-18 15:30:36 +00:00
parent ac22e5369f
commit cf7e902283
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/test-driver/Machine.pm
View File

@ -121,10 +121,6 @@ sub start {
die; die;
} }
# Wait until QEMU connects to the monitor.
accept($self->{monitor}, $monitorS) or die;
$self->waitForMonitorPrompt;
# Process serial line output. # Process serial line output.
close $serialC; close $serialC;
@ -132,9 +128,9 @@ sub start {
sub processSerialOutput { sub processSerialOutput {
my ($self, $serialP) = @_; my ($self, $serialP) = @_;
$/ = "\r\n";
while (<$serialP>) { while (<$serialP>) {
chomp; chomp;
s/\r$//;
print STDERR $self->name, "# $_\n"; print STDERR $self->name, "# $_\n";
$self->{connectedQueue}->enqueue(1) if $_ eq "===UP==="; $self->{connectedQueue}->enqueue(1) if $_ eq "===UP===";
} }
@ -142,7 +138,17 @@ sub start {
$self->{connectedQueue}->enqueue(1); $self->{connectedQueue}->enqueue(1);
} }
$self->log("vm running as pid $pid"); # Wait until QEMU connects to the monitor.
eval {
local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
accept($self->{monitor}, $monitorS) or die;
};
die "$@" if $@;
$self->waitForMonitorPrompt;
$self->log("QEMU running (pid $pid)");
$self->{pid} = $pid; $self->{pid} = $pid;
$self->{booted} = 1; $self->{booted} = 1;
} }