X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Futils%2Fpintos;h=a86e8de282973d2a6f9f5d209b2e52a34618d045;hb=44effc6c9d8039df90154f2fed045ff2e96800da;hp=124269848c0926063935cd0e4a7d897b162a310d;hpb=2b285747143381620ebf4fb37df37d90fbf25705;p=pintos-anon

diff --git a/src/utils/pintos b/src/utils/pintos
index 1242698..a86e8de 100755
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -1,6 +1,7 @@
 #! /usr/bin/perl -w
 
 use strict;
+use POSIX;
 
 our ($mem) = 4;
 our ($serial_out) = 1;
@@ -11,6 +12,8 @@ our ($vga);
 our ($jitter, $realtime);
 
 use Getopt::Long qw(:config require_order bundling);
+unshift (@ARGV, split (' ', $ENV{PINTOSOPTS}))
+    if defined $ENV{PINTOSOPTS};
 GetOptions ("sim=s" => sub { set_sim (@_) },
 	    "bochs" => sub { set_sim ("bochs") },
 	    "qemu" => sub { set_sim ("qemu") },
@@ -87,7 +90,7 @@ die "no command specified; use --help for help\n"
     if @ARGV < 1;
 my ($cmd) = shift @ARGV;
 if ($cmd eq 'run') {
-    run_vm ('EXEC', @ARGV);
+    run_vm (@ARGV);
 } elsif ($cmd eq 'make-disk') {
     usage () if @ARGV != 2;
     my ($file, $mb) = @ARGV;
@@ -110,12 +113,18 @@ if ($cmd eq 'run') {
     # Create scratch disk from file.
     die "$hostfn: $!\n" if ! -e $hostfn;
     my ($size) = -s _;
-    copy_pad ($hostfn, "scratch.dsk", 512);
+    if ($size) { 
+	copy_pad ($hostfn, "scratch.dsk", 512);
+    } else {
+	open (SCRATCH, ">scratch.dsk") or die "scratch.dsk: create: $!\n";
+	syswrite (SCRATCH, "\0" x 512);
+	close (SCRATCH);
+    }
 
     # Do copy.
     my (@cmd) = ("-ci", $guestfn, $size, "-q");
     unshift (@cmd, "-f") if $format;
-    run_vm ('EXEC', @cmd);
+    run_vm (@cmd);
 } elsif ($cmd eq 'get') {
     usage () if @ARGV != 1 && @ARGV != 2;
     my ($guestfn, $hostfn) = @ARGV;
@@ -132,7 +141,7 @@ if ($cmd eq 'run') {
 	if $scratch_size < $fs_size + 16384;
 
     # Do copy.
-    run_vm ('FORK', "-co", $guestfn, "-q");
+    run_vm ("-co", $guestfn, "-q");
 
     # Read out scratch disk.
     print "copying $guestfn from $disks[2] to $hostfn...\n";
@@ -200,8 +209,7 @@ sub create_disk {
 }
 
 sub run_vm {
-    my ($fork) = shift;
-    $fork eq 'FORK' || $fork eq 'EXEC' or die;
+    my (@args) = @_;
 
     our (@disks);
 
@@ -210,7 +218,19 @@ sub run_vm {
 	undef $disks[$i] if ! -e $disks[$i];
     }
 
-    write_cmd_line ($disks[0], @_);
+    if (my ($project) = `pwd` =~ /\b(threads|userprog|vm|filesys)\b/) {
+	if ((grep ($project eq $_, qw (userprog vm filesys)))
+	    && !defined ($disks[1])) {
+	    print STDERR "warning: it looks like you're running the $project ";
+	    print STDERR "project, but no file system disk is present\n";
+	}
+	if ($project eq 'vm' && !defined $disks[3]) {
+	    print STDERR "warning: it looks like you're running the $project ";
+	    print STDERR "project, but no swap disk is present\n";
+	}
+    }
+
+    write_cmd_line ($disks[0], @args);
 
     if ($sim eq 'bochs') {
 	my ($bin);
@@ -257,7 +277,16 @@ sub run_vm {
 	my (@cmd) = ($bin, '-q');
 	push (@cmd, '-j', $jitter) if defined $jitter;
 	print join (' ', @cmd), "\n";
-	$fork eq 'EXEC' ? exec (@cmd) : system (@cmd);
+	my ($exit) = xsystem (@cmd);
+	if (WIFEXITED ($exit)) {
+	    # Bochs exited normally.
+	    # Ignore the exit code; Bochs normally exits with status 1,
+	    # which is weird.
+	} elsif (WIFSIGNALED ($exit)) {
+	    die "Bochs died with signal ", WTERMSIG ($exit), "\n";
+	} else {
+	    die "Bochs died: code $exit\n";
+	}
     } elsif ($sim eq 'qemu') {
 	print "warning: qemu doesn't support --terminal\n"
 	    if $vga eq 'terminal';
@@ -291,6 +320,11 @@ sub run_vm {
 	print VMX "guestOS = \"linux\"\n";
 	print VMX "floppy0.present = FALSE\n";
 
+	unlink ("pintos.out");
+	print VMX "serial0.present = TRUE\n";
+	print VMX "serial0.fileType = \"file\"\n";
+	print VMX "serial0.fileName = \"pintos.out\"\n";
+
 	if (! -e 'null.bin') {
 	    open (NULL, ">null.bin") or die "null.bin: create: $!\n";
 	    close (NULL);
@@ -323,7 +357,6 @@ sub run_vm {
 	}
 	close (VMX);
 
-	use Cwd;
 	my ($vmx) = getcwd () . "/pintos.vmx";
 	system ("vmware-cmd -s register $vmx >&/dev/null");
 	system ("vmware-cmd $vmx stop hard >&/dev/null");
@@ -332,6 +365,31 @@ sub run_vm {
     }
 }
 
+sub relay_signal {
+    my ($pid, $signal) = @_;
+    kill $signal, $pid;
+    $SIG{$signal} = 'DEFAULT';
+    kill $signal, getpid ();
+}
+
+sub xsystem {
+    my ($pid) = fork;
+    if (!defined ($pid)) {
+	# Fork failed.
+	die "fork: $!\n";
+    } elsif (!$pid) {
+	# Running in child process.
+	exec (@_);
+	exit (1);
+    } else {
+	# Running in parent process.
+	local $SIG{INT} = sub { relay_signal ($pid, "INT"); };
+	local $SIG{TERM} = sub { relay_signal ($pid, "TERM"); };
+	waitpid ($pid, 0);
+	return $?;
+    }
+}
+
 sub write_cmd_line {
     my ($disk, @args) = @_;
 
@@ -349,7 +407,7 @@ sub write_cmd_line {
 
 sub run_command {
     print join (' ', @_), "\n";
-    die "command failed\n" if system (@_);
+    die "command failed\n" if xsystem (@_);
 }
 
 sub search_path {