Almost completed coding for testcases in isprmgr.c

thinkhy · May 2, 2014 · 0f417ee · thinkhy · May 2, 2014 · 0f417ee
1 parent 2f2094e
commit 0f417ee
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 14 deletions.
diff --git a/nachos/test/Makefile b/nachos/test/Makefile
@@ -63,10 +63,11 @@ start.o: start.s syscall.h
 %.coff: %.o $(NLIB)
 	$(LD) $(LDFLAGS) -o $@ $< start.o -lnachos
 
-test.coff: ./testprj2/exittest.c ./testprj2/loopawhile.c
+test.coff: ./testprj2/exittest.c ./testprj2/loopawhile.c ./testprj2/exception.c
 	$(CC) $(CFLAGS)  -c $?
 	$(LD) $(LDFLAGS) -o exittest.coff exittest.o start.o -lnachos
 	$(LD) $(LDFLAGS) -o loopawhile.coff loopawhile.o start.o -lnachos
+	$(LD) $(LDFLAGS) -o exception.coff exception.o start.o -lnachos
 
 isprmgr.coff: ./testprj2/isprmgr.c
 	$(CC) $(CFLAGS)  -c $<

diff --git a/nachos/test/out b/nachos/test/out
@@ -1,9 +1,6 @@
-++TESTEXIT: invoke exit
-                            5 
-++ISPRMGR VAR5: [STARTED]
-++ISPRMGR VAR5: invoke exec with unmatched argc
-++ISPRMGR VAR5: exec exittest.coff
-++ISPRMGR VAR5: invoke exec with unmatched argc when argv varies
-++ISPRMGR VAR5: exec exittest.coff
-++ISPRMGR VAR5: Retval of exec is                                3 
-++ISPRMGR VAR5: [END] SUCCESS
+++ISPRMGR: ARG[1] is                                7 
+++ISPRMGR VAR7: [STARTED]
+++ISPRMGR VAR7: exec exception.coff
+++ISPRMGR VAR7: [END] FAIL to invoke exec
+++ISPRMGR VAR7: Issue join to child with pid=                               2
+++ISPRMGR VAR7: [ENDED] FAIL
diff --git a/nachos/test/testprj2/exception.c b/nachos/test/testprj2/exception.c
@@ -0,0 +1,20 @@
+/*prolog******************************************************************************
+ *
+ * cname:  loopawhile.c
+ * desc:   Make the code to hit an unhandled exception in VM
+ * author: thinkhy
+ * tccall: java nachos.machine.Machine -x exception.coff  
+ * 
+ * env:    nachos 5.0j 
+ * compile:test/make
+ * Change activity:
+ *   $BC,EPT     5/2/2014 - initial release
+ *************************************************************************************/
+#define LOOPTIME (1000L)
+
+void main() {
+    int i = 0, j = 0;
+    int s = 0;
+
+    s = i / j;
+}
diff --git a/nachos/test/testprj2/isprmgr.c b/nachos/test/testprj2/isprmgr.c
@@ -41,9 +41,10 @@ int main(int argc, char *argv[]) {
  * Var 2 : runs exec multiple times and checks each child gets unique PID
  * Var 3 : tests your syscall join to a child
  * Var 4 : tests exec with error arguments (e.g. bad file name)
- * Var 5 : tests your syscall join to a non-child
- * Var 6 : tests your syscall join to a child that caused unhandled exception
- * Var 7 : tests that your exit syscall releases all resources
+ * Var 5:  tests exec with error arguments: unmatched argc
+ * Var 6 : tests your syscall join to a non-child
+ * Var 7 : tests your syscall join to a child that caused unhandled exception
+ * Var 8 : tests that your exit syscall releases all resources
  *
  ******************************************************************************************/
     int i;
@@ -170,6 +171,8 @@ void route(int variation, char dbg_flag)
                 LOG("++ISPRMGR VAR3: [ENDED] FAIL\n");
             }
 
+            break;
+
         case 4:
             /*************************************************************************/
             /*                                                                       */
@@ -189,6 +192,8 @@ void route(int variation, char dbg_flag)
             else
                 LOG("++ISPRMGR VAR4: [END] FAIL\n");
 
+            break;
+
         case 5:
             /*************************************************************************/
             /*                                                                       */
@@ -225,10 +230,73 @@ void route(int variation, char dbg_flag)
             else
                 LOG("++ISPRMGR VAR5: [END] FAIL\n");
 
+            break;
 
         case 6:
+            /*************************************************************************/
+            /*                                                                       */
+            /* Var 6 : tests your syscall join to a non-child                        */
+            /*                                                                       */
+            /*************************************************************************/
+            LOG("++ISPRMGR VAR6: [STARTED]\n");
+
+            LOG("++ISPRMGR VAR6: Issue join to a non-chold with pid=0\n");
+            retval = join(0, &exitstatus);
+            if (retval == 0) {
+                LOG("++ISPRMGR VAR6: [ENDED] FAIL\n");
+                break;
+            }
+
+            LOG("++ISPRMGR VAR6: Issue join to myself with pid=1\n");
+            retval = join(1, &exitstatus);
+            if (retval == 0) {
+                LOG("++ISPRMGR VAR6: [ENDED] FAIL\n");
+                break;
+            }
+
+            LOG("++ISPRMGR VAR6: [ENDED] SUCCESS\n");
+
         case 7:
+            /*************************************************************************/
+            /*                                                                       */
+            /* Var 7 : tests your syscall join to a child                            */   
+            /* that caused unhandled exception                                       */
+            /*                                                                       */
+            /*************************************************************************/
+            LOG("++ISPRMGR VAR7: [STARTED]\n");
+
+            executable = "exception.coff";
+            _argv[0] = executable;
+            _argv[1] = NULL;
+            _argc = 1; 
+            LOG("++ISPRMGR VAR7: exec %s\n", executable);
+            pid[0] = exec(executable, _argc, _argv);
+            if (pid[0] != 0) {
+                LOG("++ISPRMGR VAR7: [END] FAIL to invoke exec\n");
+            }
+
+            LOG("++ISPRMGR VAR7: Issue join to child with pid=%d\n", pid[0]);
+            retval = join(pid[0], &exitstatus);
+            if (retval == 0) {
+                LOG("++ISPRMGR VAR7: [ENDED] FAIL\n");
+             /home/huangye/study/CS162/nachos/test/testprj2   break;
+            }
+            else {
+                LOG("++ISPRMGR VAR7: [ENDED] SUCCESS\n");
+            }
+
+            break; 
         case 8:
+            /*************************************************************************/
+            /*                                                                       */
+            /* Var 8: tests that your exit syscall releases all resources   */
+            /*                                                                       */
+            /*************************************************************************/
+            /* TODO: it's difficult to write code for this case                      */
+
+
+            break; 
+
         default:
             0;
     }

diff --git a/nachos/test/testprj2/loopawhile.c b/nachos/test/testprj2/loopawhile.c
@@ -0,0 +1,23 @@
+/*prolog******************************************************************************
+ *
+ * cname:  loopawhile.c
+ * desc:   loop lots of time. this program will be exec'ed by test cases in isprmgr.c
+ * author: thinkhy
+ * tccall: java nachos.machine.Machine -x loopawhile.coff  
+ * 
+ * env:    nachos 5.0j 
+ * compile:test/make
+ * Change activity:
+ *   $BC,EPT     5/2/2014 - initial release
+ *************************************************************************************/
+#define LOOPTIME (1000L)
+
+void main() {
+    int i = 0, j = 0;
+    int s = 0;
+    for (i = 0; i < LOOPTIME; i++) {
+        for (j = 0; j < LOOPTIME; j++) {
+            s = s + 100;
+        }
+    }
+}
diff --git a/nachos/userprog/UserKernel.java b/nachos/userprog/UserKernel.java
@@ -123,7 +123,7 @@ public void run() {
     // [added by hy 12/31/2013]
     Lib.debug('a', "Shell program: " + shellProgram);
 
-	Lib.assertTrue(process.execute(shellProgram, new String[] {shellProgram, "5" }));
+	Lib.assertTrue(process.execute(shellProgram, new String[] {shellProgram, "7" }));
 
 	KThread.currentThread().finish();
     }

diff --git a/nachos/userprog/UserProcess.java b/nachos/userprog/UserProcess.java
@@ -1108,6 +1108,9 @@ public void handleException(int cause) {
 	default:
 	    Lib.debug(dbgProcess, "Unexpected exception: " +
 		      Processor.exceptionNames[cause]);
+
+        /* Fix defect by isprmgr, Var7                            */
+        handleExit(-1);                                     /*@BCA*/
 	    Lib.assertNotReached("Unexpected exception");
 	}
     }