hw4 test

code/machine/stats.h

@@ -20,25 +20,25 @@
 // The fields in this class are public to make it easier to update.
 
 class Statistics {
-  public:
-    int totalTicks;      	// Total time running Nachos
-    int idleTicks;       	// Time spent idle (no threads to run)
-    int systemTicks;	 	// Time spent executing system code
-    int userTicks;       	// Time spent executing user code
-				// (this is also equal to # of
-				// user instructions executed)
+public:
+  int totalTicks;      	// Total time running Nachos
+  int idleTicks;       	// Time spent idle (no threads to run)
+  int systemTicks;	 	// Time spent executing system code
+  int userTicks;       	// Time spent executing user code
+  // (this is also equal to # of
+  // user instructions executed)
 
-    int numDiskReads;		// number of disk read requests
-    int numDiskWrites;		// number of disk write requests
-    int numConsoleCharsRead;	// number of characters read from the keyboard
-    int numConsoleCharsWritten; // number of characters written to the display
-    int numPageFaults;		// number of virtual memory page faults
-    int numPacketsSent;		// number of packets sent over the network
-    int numPacketsRecvd;	// number of packets received over the network
+  int numDiskReads;		// number of disk read requests
+  int numDiskWrites;		// number of disk write requests
+  int numConsoleCharsRead;	// number of characters read from the keyboard
+  int numConsoleCharsWritten; // number of characters written to the display
+  int numPageFaults;		// number of virtual memory page faults
+  int numPacketsSent;		// number of packets sent over the network
+  int numPacketsRecvd;	// number of packets received over the network
 
-    Statistics(); 		// initialize everything to zero
+  Statistics(); 		// initialize everything to zero
 
-    void Print();		// print collected statistics
+  void Print();		// print collected statistics
 };
 
 // Constants used to reflect the relative time an operation would
@@ -49,12 +49,15 @@ class Statistics {
 // in the kernel measured by the number of calls to enable interrupts,
 // these time constants are none too exact.
 
-const int UserTick = 	   1;	// advance for each user-level instruction 
-const int SystemTick =	  10; 	// advance each time interrupts are enabled
+const int UserTick = 1;	// advance for each user-level instruction 
+const int SystemTick = 10; 	// advance each time interrupts are enabled
 const int RotationTime = 500; 	// time disk takes to rotate one sector
-const int SeekTime =	 500;  	// time disk takes to seek past one track
-const int ConsoleTime =	 100;	// time to read or write one character
-const int NetworkTime =	 100;  	// time to send or receive one packet
-const int TimerTicks = 	 100;  	// (average) time between timer interrupts
+const int SeekTime = 500;  	// time disk takes to seek past one track
+
+// MP4 MODIFIED
+const int ConsoleTime = 1;	// time to read or write one character
+
+const int NetworkTime = 100;  	// time to send or receive one packet
+const int TimerTicks = 100;  	// (average) time between timer interrupts
 
 #endif // STATS_H