Ytshih/hw2

code/threads/kernel.cc

@@ -26,58 +26,60 @@
 
 Kernel::Kernel(int argc, char **argv)
 {
-    randomSlice = FALSE; 
-    debugUserProg = FALSE;
-    consoleIn = NULL;          // default is stdin
-    consoleOut = NULL;         // default is stdout
+  execfileNum = 0;
+  threadNum = 0;
+  randomSlice = FALSE; 
+  debugUserProg = FALSE;
+  consoleIn = NULL;          // default is stdin
+  consoleOut = NULL;         // default is stdout
 #ifndef FILESYS_STUB
-    formatFlag = FALSE;
+  formatFlag = FALSE;
 #endif
-    reliability = 1;            // network reliability, default is 1.0
-    hostName = 0;               // machine id, also UNIX socket name
-                                // 0 is the default machine id
-    for (int i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "-rs") == 0) {
- 	    	ASSERT(i + 1 < argc);
-	    	RandomInit(atoi(argv[i + 1]));// initialize pseudo-random
-			// number generator
-	    	randomSlice = TRUE;
-	    	i++;
-        } else if (strcmp(argv[i], "-s") == 0) {
-            debugUserProg = TRUE;
-		} else if (strcmp(argv[i], "-e") == 0) {
-        	execfile[++execfileNum]= argv[++i];
-			cout << execfile[execfileNum] << "\n";
-		} else if (strcmp(argv[i], "-ci") == 0) {
-	    	ASSERT(i + 1 < argc);
-	    	consoleIn = argv[i + 1];
-	    	i++;
-		} else if (strcmp(argv[i], "-co") == 0) {
-	    	ASSERT(i + 1 < argc);
-	    	consoleOut = argv[i + 1];
-	    	i++;
+  reliability = 1;            // network reliability, default is 1.0
+  hostName = 0;               // machine id, also UNIX socket name
+                              // 0 is the default machine id
+  for (int i = 1; i < argc; i++) {
+    if (strcmp(argv[i], "-rs") == 0) {
+      ASSERT(i + 1 < argc);
+      RandomInit(atoi(argv[i + 1]));// initialize pseudo-random
+                                    // number generator
+      randomSlice = TRUE;
+      i++;
+    } else if (strcmp(argv[i], "-s") == 0) {
+      debugUserProg = TRUE;
+    } else if (strcmp(argv[i], "-e") == 0) {
+      execfile[++execfileNum]= argv[++i];
+      cout << execfile[execfileNum] << "\n";
+    } else if (strcmp(argv[i], "-ci") == 0) {
+      ASSERT(i + 1 < argc);
+      consoleIn = argv[i + 1];
+      i++;
+    } else if (strcmp(argv[i], "-co") == 0) {
+      ASSERT(i + 1 < argc);
+      consoleOut = argv[i + 1];
+      i++;
 #ifndef FILESYS_STUB
-		} else if (strcmp(argv[i], "-f") == 0) {
-	    	formatFlag = TRUE;
+    } else if (strcmp(argv[i], "-f") == 0) {
+      formatFlag = TRUE;
 #endif
-        } else if (strcmp(argv[i], "-n") == 0) {
-            ASSERT(i + 1 < argc);   // next argument is float
-            reliability = atof(argv[i + 1]);
-            i++;
-        } else if (strcmp(argv[i], "-m") == 0) {
-            ASSERT(i + 1 < argc);   // next argument is int
-            hostName = atoi(argv[i + 1]);
-            i++;
-        } else if (strcmp(argv[i], "-u") == 0) {
-            cout << "Partial usage: nachos [-rs randomSeed]\n";
-	   		cout << "Partial usage: nachos [-s]\n";
-            cout << "Partial usage: nachos [-ci consoleIn] [-co consoleOut]\n";
+    } else if (strcmp(argv[i], "-n") == 0) {
+      ASSERT(i + 1 < argc);   // next argument is float
+      reliability = atof(argv[i + 1]);
+      i++;
+    } else if (strcmp(argv[i], "-m") == 0) {
+      ASSERT(i + 1 < argc);   // next argument is int
+      hostName = atoi(argv[i + 1]);
+      i++;
+    } else if (strcmp(argv[i], "-u") == 0) {
+      cout << "Partial usage: nachos [-rs randomSeed]\n";
+      cout << "Partial usage: nachos [-s]\n";
+      cout << "Partial usage: nachos [-ci consoleIn] [-co consoleOut]\n";
 #ifndef FILESYS_STUB
-	    	cout << "Partial usage: nachos [-nf]\n";
+      cout << "Partial usage: nachos [-nf]\n";
 #endif
-            cout << "Partial usage: nachos [-n #] [-m #]\n";
-		}
+      cout << "Partial usage: nachos [-n #] [-m #]\n";
     }
+  }
 }
 
 //----------------------------------------------------------------------
@@ -90,31 +92,32 @@ Kernel::Kernel(int argc, char **argv)
 void
 Kernel::Initialize()
 {
-    // We didn't explicitly allocate the current thread we are running in.
-    // But if it ever tries to give up the CPU, we better have a Thread
-    // object to save its state. 
+  // We didn't explicitly allocate the current thread we are running in.
+  // But if it ever tries to give up the CPU, we better have a Thread
+  // object to save its state. 
 
-	
-    currentThread = new Thread("main", threadNum++);		
-    currentThread->setStatus(RUNNING);
 
-    stats = new Statistics();		// collect statistics
-    interrupt = new Interrupt;		// start up interrupt handling
-    scheduler = new Scheduler();	// initialize the ready queue
-    alarm = new Alarm(randomSlice);	// start up time slicing
-    machine = new Machine(debugUserProg);
-    synchConsoleIn = new SynchConsoleInput(consoleIn); // input from stdin
-    synchConsoleOut = new SynchConsoleOutput(consoleOut); // output to stdout
-    synchDisk = new SynchDisk();    //
+  currentThread = new Thread("main", threadNum++);		
+  currentThread->setStatus(RUNNING);
+
+  stats = new Statistics();		// collect statistics
+  interrupt = new Interrupt;		// start up interrupt handling
+  scheduler = new Scheduler();	// initialize the ready queue
+  alarm = new Alarm(randomSlice);	// start up time slicing
+  machine = new Machine(debugUserProg);
+  synchConsoleIn = new SynchConsoleInput(consoleIn); // input from stdin
+  synchConsoleOut = new SynchConsoleOutput(consoleOut); // output to stdout
+  synchDisk = new SynchDisk();    //
 #ifdef FILESYS_STUB
-    fileSystem = new FileSystem();
+  fileSystem = new FileSystem();
 #else
-    fileSystem = new FileSystem(formatFlag);
+  fileSystem = new FileSystem(formatFlag);
 #endif // FILESYS_STUB
-    postOfficeIn = new PostOfficeInput(10);
-    postOfficeOut = new PostOfficeOutput(reliability);
+  postOfficeIn = new PostOfficeInput(10);
+  postOfficeOut = new PostOfficeOutput(reliability);
+  frameTable = new FrameTable;
 
-    interrupt->Enable();
+  interrupt->Enable();
 }
 
 //----------------------------------------------------------------------
@@ -124,19 +127,20 @@ Kernel::Initialize()
 
 Kernel::~Kernel()
 {
-    delete stats;
-    delete interrupt;
-    delete scheduler;
-    delete alarm;
-    delete machine;
-    delete synchConsoleIn;
-    delete synchConsoleOut;
-    delete synchDisk;
-    delete fileSystem;
-    delete postOfficeIn;
-    delete postOfficeOut;
-    
-    Exit(0);
+  delete stats;
+  delete interrupt;
+  delete scheduler;
+  delete alarm;
+  delete machine;
+  delete synchConsoleIn;
+  delete synchConsoleOut;
+  delete synchDisk;
+  delete fileSystem;
+  delete postOfficeIn;
+  delete postOfficeOut;
+  delete frameTable;
+
+  Exit(0);
 }
 
 //----------------------------------------------------------------------
@@ -239,7 +243,7 @@ Kernel::NetworkTest() {
         postOfficeOut->Send(outPktHdr, outMailHdr, ack); 
 
         // Wait for the ack from the other machine to the first message we sent
-	postOfficeIn->Receive(1, &inPktHdr, &inMailHdr, buffer);
+        postOfficeIn->Receive(1, &inPktHdr, &inMailHdr, buffer);
         cout << "Got: " << buffer << " : from " << inPktHdr.from << ", box " 
                                                 << inMailHdr.from << "\n";
         cout.flush();
@@ -250,12 +254,10 @@ Kernel::NetworkTest() {
 
 void ForkExecute(Thread *t)
 {
-	if ( !t->space->Load(t->getName()) ) {
-    	return;             // executable not found
-    }
-	
-    t->space->Execute(t->getName());
+  if (!t->space->Load(t->getName()))
+    return; // executable not found
 
+  t->space->Execute(t->getName());
 }
 
 void Kernel::ExecAll()
@@ -273,9 +275,8 @@ int Kernel::Exec(char* name)
 	t[threadNum] = new Thread(name, threadNum);
 	t[threadNum]->space = new AddrSpace();
 	t[threadNum]->Fork((VoidFunctionPtr) &ForkExecute, (void *)t[threadNum]);
-	threadNum++;
 
-	return threadNum-1;
+	return threadNum++;
 /*
     cout << "Total threads number is " << execfileNum << endl;
     for (int n=1;n<=execfileNum;n++) {