Always round up disk sizes to multiple of a cylinder,

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index 8721db313042bb35438dd1cf20856aa0f816c7e2..32a4af59eadd7c834a3f583010e0dfa455c01450 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -19,7 +19,7 @@ our (@puts);                  # Files to copy into the VM.
 our (@gets);                   # Files to copy out of the VM.
 our ($as_ref);                 # Reference to last addition to @gets or @puts.
 our (@kernel_args);            # Arguments to pass to kernel.
-our (%disks) = (OS => {FILENAME => 'os.dsk'},          # Disks to give VM.
+our (%disks) = (OS => {DEF_FN => 'os.dsk'},            # Disks to give VM.
                FS => {DEF_FN => 'fs.dsk'},
                SCRATCH => {DEF_FN => 'scratch.dsk'},
                SWAP => {DEF_FN => 'swap.dsk'});
@@ -193,9 +193,13 @@ sub set_as {
 sub find_disks {
     for my $disk (values %disks) {
        # If there's no assigned file name but the default file exists,
-       # assign the default file.
-       $disk->{FILENAME} = $disk->{DEF_FN}
-         if !defined ($disk->{FILENAME}) && -e $disk->{DEF_FN};
+       # try to assign a default file name.
+       if (!defined ($disk->{FILENAME})) {
+           for my $try_fn ($disk->{DEF_FN}, "build/" . $disk->{DEF_FN}) {
+               $disk->{FILENAME} = $try_fn, last
+                 if -e $try_fn;
+           }
+       }
 
        # If there's no file name, we're done.
        next if !defined ($disk->{FILENAME});
@@ -208,10 +212,8 @@ sub find_disks {
            my ($mb) = $disk->{FILENAME};
            undef $disk->{FILENAME};
 
-           my ($cylinder) = 1024 * 504;
-           my ($bytes) = $mb * ($cylinder * 2);
-           $bytes = int (($bytes + $cylinder - 1) / $cylinder) * $cylinder;
-           extend_disk ($disk, $bytes);
+           my ($cyl_size) = 512 * 16 * 63;
+           extend_disk ($disk, ceil ($mb * 2) * $cyl_size);
        } else {
            # The file must exist and have nonzero size.
            -e $disk->{FILENAME} or die "$disk->{FILENAME}: stat: $!\n";
@@ -220,6 +222,7 @@ sub find_disks {
     }
 
     # Warn about (potentially) missing disks.
+    die "Cannot find OS disk\n" if !defined $disks{OS}{FILENAME};
     if (my ($project) = `pwd` =~ /\b(threads|userprog|vm|filesys)\b/) {
        if ((grep ($project eq $_, qw (userprog vm filesys)))
            && !defined ($disks{FS}{FILENAME})) {
@@ -420,9 +423,10 @@ EOF
 # line for attaching it to $device.
 sub print_bochs_disk_line {
     my ($device, $iface) = @_;
-    my ($file) = $disks_by_iface[$iface]{FILENAME};
+    my ($disk) = $disks_by_iface[$iface];
+    my ($file) = $disk->{FILENAME};
     if (defined $file) {
-       my (%geom) = disk_geometry ($file);
+       my (%geom) = disk_geometry ($disk);
        print BOCHSRC "$device: type=disk, path=$file, mode=flat, ";
        print BOCHSRC "cylinders=$geom{C}, heads=$geom{H}, spt=$geom{S}, ";
        print BOCHSRC "translation=none\n";
@@ -441,7 +445,7 @@ sub run_qemu {
        push (@cmd, $option, $disks_by_iface[$iface]{FILENAME})
          if defined $disks_by_iface[$iface]{FILENAME};
     }
-    push (@cmd, '-m', $mem);
+    push (@cmd, '-m', $mem, '-nics', '0');
     push (@cmd, '-nographic') if $vga eq 'none';
     push (@cmd, '-serial', 'stdio') if $serial_out && $vga ne 'none';
     push (@cmd, '-S') if $debug eq 'monitor';
@@ -482,7 +486,8 @@ serial0.fileName = "pintos.out"
 EOF
 
     for (my ($i) = 0; $i < 4; $i++) {
-       my ($dsk) = $disks_by_iface[$i]{FILENAME};
+       my ($disk) = $disks_by_iface[$i];
+       my ($dsk) = $disk->{FILENAME};
        next if !defined $dsk;
 
        my ($pln) = $dsk;
@@ -497,7 +502,7 @@ $device.deviceType = "plainDisk"
 $device.fileName = "$pln"
 EOF
 
-       my (%geom) = disk_geometry ($dsk);
+       my (%geom) = disk_geometry ($disk);
        open (PLN, ">", $pln) or die "$pln: create: $!\n";
        print PLN <<EOF;
 DRIVETYPE      ide
@@ -575,12 +580,14 @@ sub extend_disk {
 # Examines $file and returns a valid IDE disk geometry for it, as a
 # hash.
 sub disk_geometry {
-    my ($file) = @_;
+    my ($disk) = @_;
+    my ($file) = $disk->{FILENAME};
     my ($size) = -s $file;
     die "$file: stat: $!\n" if !defined $size;
     die "$file: size not a multiple of 512 bytes\n" if $size % 512;
-    my ($cylinders) = int ($size / (512 * 16 * 63));
-    $cylinders++ if $size % (512 * 16 * 63);
+    my ($cyl_size) = 512 * 16 * 63;
+    my ($cylinders) = ceil ($size / $cyl_size);
+    extend_disk ($disk, $cylinders * $cyl_size) if $size % $cyl_size;
 
     return (CAPACITY => $size / 512,
            C => $cylinders,
@@ -682,10 +689,12 @@ sub relay_signal {
 # Interrupts $pid and dies with a timeout error message.
 sub timeout {
     my ($pid) = @_;
-    relay_signal ($pid, "INT");
+    kill "INT", $pid;
+    waitpid ($pid, 0);
+    seek (STDOUT, 0, 2);
     my ($load_avg) = `uptime` =~ /(load average:.*)$/i;
-    print "TIMEOUT after $timeout seconds";
+    print "\nTIMEOUT after $timeout seconds";
     print  " - $load_avg" if defined $load_avg;
     print "\n";
-    exit (2);
+    exit 0;
 }