X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Futils%2Fpintos;h=b803c949068eef8108bfd3dfbd02e32f30070be5;hb=ef0f93908b437a4a9df4f422fe2e4844514011db;hp=c30633c93de2b9b175fb898c709ffb287c61208d;hpb=837e5b7fb902bd749106309ef76a5276c73ca34c;p=pintos-anon

diff --git a/src/utils/pintos b/src/utils/pintos
index c30633c..b803c94 100755
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -8,7 +8,7 @@ use Getopt::Long qw(:config bundling);
 
 # Command-line options.
 our ($start_time) = time ();
-our ($sim);			# Simulator: bochs, qemu, or gsx.
+our ($sim);			# Simulator: bochs, qemu, or player.
 our ($debug) = "none";		# Debugger: none, monitor, or gdb.
 our ($mem) = 4;			# Physical RAM in MB.
 our ($serial) = 1;		# Use serial port for input and output?
@@ -49,7 +49,7 @@ sub parse_command_line {
 	GetOptions ("sim=s" => sub { set_sim (@_) },
 		    "bochs" => sub { set_sim ("bochs") },
 		    "qemu" => sub { set_sim ("qemu") },
-		    "gsx" => sub { set_sim ("gsx") },
+		    "player" => sub { set_sim ("player") },
 
 		    "debug=s" => sub { set_debug (@_) },
 		    "no-debug" => sub { set_debug ("none") },
@@ -108,8 +108,8 @@ where each OPTION is one of the following options
   and each ARGUMENT is passed to Pintos kernel verbatim.
 Simulator selection:
   --bochs                  (default) Use Bochs as simulator
-  --qemu                   Use qemu as simulator
-  --gsx                    Use VMware GSX Server 3.x as simulator
+  --qemu                   Use QEMU as simulator
+  --player                 Use VMware Player as simulator
 Debugger selection:
   --no-debug               (default) No debugger
   --monitor                Debug with simulator's monitor
@@ -318,7 +318,7 @@ sub get_scratch_file {
 
     # Copy file data.
     my ($get_handle);
-    sysopen ($get_handle, $get_file_name, O_WRONLY | O_CREAT | O_EXCL, 0666)
+    sysopen ($get_handle, $get_file_name, O_WRONLY | O_CREAT, 0666)
       or die "$get_file_name: create: $!\n";
     copy_file ($disk_handle, $disk_file_name, $get_handle, $get_file_name,
 	       $size);
@@ -366,8 +366,8 @@ sub run_vm {
 	run_bochs ();
     } elsif ($sim eq 'qemu') {
 	run_qemu ();
-    } elsif ($sim eq 'gsx') {
-	run_gsx ();
+    } elsif ($sim eq 'player') {
+	run_player ();
     } else {
 	die "unknown simulator `$sim'\n";
     }
@@ -380,9 +380,7 @@ sub run_bochs {
 
     my ($squish_pty);
     if ($serial) {
-	for my $dir (split (':', $ENV{PATH})) {
-	    $squish_pty = "$dir/squish-pty", last if -x "$dir/squish-pty";
-	}
+	$squish_pty = find_in_path ("squish-pty");
 	print "warning: can't find squish-pty, so terminal input will fail\n"
 	  if !defined $squish_pty;
     }
@@ -456,7 +454,7 @@ sub print_bochs_disk_line {
     }
 }
 
-# Runs qemu.
+# Runs QEMU.
 sub run_qemu {
     print "warning: qemu doesn't support --terminal\n"
       if $vga eq 'terminal';
@@ -478,38 +476,50 @@ sub run_qemu {
     run_command (@cmd);
 }
 
-# gsx_unsup($flag)
+# player_unsup($flag)
 #
-# Prints a message that $flag is unsupported by GSX Server.
-sub gsx_unsup {
+# Prints a message that $flag is unsupported by VMware Player.
+sub player_unsup {
     my ($flag) = @_;
-    print "warning: no support for $flag with VMware GSX Server\n";
+    print "warning: no support for $flag with VMware Player\n";
 }
 
-# Runs VMware GSX Server.
-sub run_gsx {
-    gsx_unsup ("--$debug") if $debug ne 'none';
-    gsx_unsup ("--no-vga") if $vga eq 'none';
-    gsx_unsup ("--terminal") if $vga eq 'terminal';
-    gsx_unsup ("--jitter") if defined $jitter;
-    gsx_unsup ("--kill-on-failure") if defined $kill_on_failure;
+# Runs VMware Player.
+sub run_player {
+    player_unsup ("--$debug") if $debug ne 'none';
+    player_unsup ("--no-vga") if $vga eq 'none';
+    player_unsup ("--terminal") if $vga eq 'terminal';
+    player_unsup ("--jitter") if defined $jitter;
+    player_unsup ("--timeout"), undef $timeout if defined $timeout;
+    player_unsup ("--kill-on-failure"), undef $kill_on_failure
+      if defined $kill_on_failure;
 
-    unlink ("pintos.out");
+    # Memory size must be multiple of 4.
+    $mem = int (($mem + 3) / 4) * 4;
 
     open (VMX, ">", "pintos.vmx") or die "pintos.vmx: create: $!\n";
     chmod 0777 & ~umask, "pintos.vmx";
     print VMX <<EOF;
 #! /usr/bin/vmware -G
-config.version = 6
+config.version = 8
 guestOS = "linux"
-floppy0.present = FALSE
 memsize = $mem
+floppy0.present = FALSE
+usb.present = FALSE
+sound.present = FALSE
+gui.exitAtPowerOff = TRUE
+gui.exitOnCLIHLT = TRUE
+gui.powerOnAtStartUp = TRUE
 EOF
 
+
+
     print VMX <<EOF if $serial;
 serial0.present = TRUE
-serial0.fileType = "file"
-serial0.fileName = "pintos.out"
+serial0.fileType = "pipe"
+serial0.fileName = "pintos.socket"
+serial0.pipe.endPoint = "client"
+serial0.tryNoRxLoss = "TRUE"
 EOF
 
     for (my ($i) = 0; $i < 4; $i++) {
@@ -517,11 +527,8 @@ EOF
 	my ($dsk) = $disk->{FILE_NAME};
 	next if !defined $dsk;
 
-	my ($pln) = $dsk;
-	$pln =~ s/\.dsk//;
-	$pln .= ".pln";
-
 	my ($device) = "ide" . int ($i / 2) . ":" . ($i % 2);
+	my ($pln) = "$device.pln";
 	print VMX <<EOF;
 
 $device.present = TRUE
@@ -529,28 +536,48 @@ $device.deviceType = "plainDisk"
 $device.fileName = "$pln"
 EOF
 
+	open (URANDOM, '<', '/dev/urandom') or die "/dev/urandom: open: $!\n";
+	my ($bytes);
+	sysread (URANDOM, $bytes, 4) == 4 or die "/dev/urandom: read: $!\n";
+	close (URANDOM);
+	my ($cid) = unpack ("L", $bytes);
+
 	my (%geom) = disk_geometry ($disk);
 	open (PLN, ">", $pln) or die "$pln: create: $!\n";
 	print PLN <<EOF;
-DRIVETYPE	ide
-#vm|VERSION	2
-#vm|TOOLSVERSION	2
-CYLINDERS	$geom{C}
-HEADS		$geom{H}
-SECTORS		$geom{S}
-#vm|CAPACITY	$geom{CAPACITY}
-ACCESS "$dsk" 0 $geom{CAPACITY}
+version=1
+CID=$cid
+parentCID=ffffffff
+createType="monolithicFlat"
+
+RW $geom{CAPACITY} FLAT "$dsk" 0
+
+# The Disk Data Base
+#DDB
+
+ddb.adapterType = "ide"
+ddb.virtualHWVersion = "4"
+ddb.toolsVersion = "2"
+ddb.geometry.cylinders = "$geom{C}"
+ddb.geometry.heads = "$geom{H}"
+ddb.geometry.sectors = "$geom{S}"
 EOF
 	close (PLN);
     }
     close (VMX);
 
+    my ($squish_unix);
+    if ($serial) {
+	$squish_unix = find_in_path ("squish-unix");
+	print "warning: can't find squish-unix, so terminal input ",
+	  "and output will fail\n" if !defined $squish_unix;
+    }
+
     my ($vmx) = getcwd () . "/pintos.vmx";
-    system ("vmware-cmd -s register $vmx >&/dev/null");
-    system ("vmware-cmd $vmx stop hard >&/dev/null");
-    system ("vmware -l -G -x -q $vmx");
-    system ("vmware-cmd $vmx stop hard >&/dev/null");
-    system ("vmware-cmd -s unregister $vmx >&/dev/null");
+    my (@cmd) = ("vmplayer", $vmx);
+    unshift (@cmd, $squish_unix, "pintos.socket") if $squish_unix;
+    print join (' ', @cmd), "\n";
+    xsystem (@cmd);
 }
 
 # Disk utilities.
@@ -680,7 +707,7 @@ sub run_command {
 # Relays common signals to the subprocess.
 # If $timeout is set then the subprocess will be killed after that long.
 sub xsystem {
-    # qemu turns off local echo and does not restore it if killed by a signal.
+    # QEMU turns off local echo and does not restore it if killed by a signal.
     # We compensate by restoring it ourselves.
     my $cleanup = sub {};
     if (isatty (0)) {
@@ -831,3 +858,13 @@ sub SIGVTALRM {
     }
     return 0;
 }
+
+# find_in_path ($program)
+#
+# Searches for $program in $ENV{PATH}.
+# Returns $program if found, otherwise undef.
+sub find_in_path {
+    my ($program) = @_;
+    -x "$_/$program" and return $program foreach split (':', $ENV{PATH});
+    return;
+}