Finish Lab 2

Author: belanasaikiran

ASST0.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+
+cd /root/cs350-os161/os161-1.99
+./configure --ostree=/root/cs350-os161/root --toolprefix=cs350-
+
+
 cd /root/cs350-os161/os161-1.99/kern/conf
 
 ./config ASST0
@@ -22,5 +27,5 @@ bmake install
 # Running the kernel
 
 cd /root/cs350-os161/root
-exec bash
-# sys161 kernel-ASST0 #execute/run the kernel
+#exec bash
+sys161 kernel-ASST0 #execute/run the kernel

os161-1.99/kern/arch/mips/syscall/syscall.c

@@ -109,12 +109,12 @@ syscall(struct trapframe *tf)
 				 (userptr_t)tf->tf_a1);
 		break;
 
-		// Lab 2
-		case SYS___exitwithcode: // Lab 2: Part B
-			sys__exit((int)tf->tf_a0);
-			/* sys__exit does not return, execution should not get here */
-			panic("unexpected return from sys__exit");
-			break;
+		// Lab 2: Part B
+		case SYS__exit:
+		sys__exit((int)tf->tf_a0);
+		/* sys__exit does not return, execution should not get here */
+		panic("unexpected return from sys__exit");
+		break;
 
 		case SYS_printint: // Lab 2: Part C
 			err = sys_printint((int)tf->tf_a0);
@@ -130,11 +130,7 @@ syscall(struct trapframe *tf)
 			  (int)tf->tf_a2,
 			  (int *)(&retval));
 	  break;
-	case SYS__exit:
-	  sys__exit((int)tf->tf_a0);
-	  /* sys__exit does not return, execution should not get here */
-	  panic("unexpected return from sys__exit");
-	  break;
+
 	case SYS_getpid:
 	  err = sys_getpid((pid_t *)&retval);
 	  break;

os161-1.99/kern/include/kern/syscall.h

@@ -50,6 +50,7 @@
 #define SYS_fork         0
 #define SYS_vfork        1
 #define SYS_execv        2
+// Lab 2: Part B
 #define SYS__exit        3
 #define SYS_waitpid      4
 #define SYS_getpid       5
@@ -198,9 +199,10 @@
 //#define SYS___sysctl   120
 
 // Lab 2
-#define SYS___exitwithcode      121 // Lab 2: Part B
-#define SYS_printint            122 // Lab 2: Part C
-#define SYS_reversestring       123 // Lab 2: Part D
+// Lab 2: part C
+#define SYS_printint            122 
+// Lab 2: Part D
+#define SYS_reversestring       123 
 
 /*CALLEND*/
 

os161-1.99/kern/include/syscall.h

@@ -59,14 +59,16 @@ int sys_reboot(int code);
 int sys___time(userptr_t user_seconds, userptr_t user_nanoseconds);
 
 
-// Lab 2
-void sys___exit(int exitcode); // Lab 2: Part B
-int sys_printint(int c); // Lab 2: Part C
-int sys_reversestring(const char *str, int len); // Lab 2: Part D
+/*************** Lab 2 ***************/
+// Lab 2: Part C
+int sys_printint(int c); 
+// Lab 2: Part D
+int sys_reversestring(const char *str, int len); 
 
 
 #ifdef UW
 int sys_write(int fdesc,userptr_t ubuf,unsigned int nbytes,int *retval);
+// Lab 2: Part B
 void sys__exit(int exitcode);
 int sys_getpid(pid_t *retval);
 int sys_waitpid(pid_t pid, userptr_t status, int options, pid_t *retval);

os161-1.99/kern/include/thread.h

@@ -148,7 +148,7 @@ int thread_fork(const char *name, struct proc *proc,
  * Cause the current thread to exit.
  * Interrupts need not be disabled.
  */
-void thread_exit(void);
+void thread_exit(int exitcode);
 
 /*
  * Cause the current thread to yield to the next runnable thread, but

os161-1.99/kern/startup/menu.c

@@ -285,7 +285,7 @@ cmd_quit(int nargs, char **args)
 
 	vfs_sync();
 	sys_reboot(RB_POWEROFF);
-	thread_exit();
+	thread_exit(0); // for now, I'm passing this value to just print something
 	return 0;
 }
 

os161-1.99/kern/syscall/proc_syscalls.c

@@ -13,6 +13,7 @@
   /* this implementation of sys__exit does not do anything with the exit code */
   /* this needs to be fixed to get exit() and waitpid() working properly */
 
+// Lab 2: Part B
 void sys__exit(int exitcode) {
 
   struct addrspace *as;
@@ -43,7 +44,10 @@ void sys__exit(int exitcode) {
      will wake up the kernel menu thread */
   proc_destroy(p);
 
-  thread_exit();
+
+// Lab 2: Part B
+  thread_exit(exitcode);
+  
   /* thread_exit() does not return, so we should never get here */
   panic("return from thread_exit in sys_exit\n");
 }

os161-1.99/kern/syscall/simple_syscalls.c

@@ -6,40 +6,33 @@
 #include <kern/unistd.h>
 #include <current.h>
 
-// Lab 2: Part B
-void sys___exit(int exitcode) {
-    kprintf("exit: (%d)\n", exitcode);
-
-    kprintf("Thread %s exited with code %d\n", curthread->t_name, exitcode);
-
-    thread_exit();
-
-    panic("sys__exit: Thread did not exit properly\n");
-}
 
 // Lab 2: Part C
 int sys_printint(int c) { 
-    kprintf("Given Number: %d\n", c);
+    kprintf("Number: %d\n", c);
 
     return (c % 2 == 0) ? 0 : 1;
 }
 
-// Implement a simplified system call named int reversestring(const char *str, int len) 
-
-// This system call should accept a string and length of the string as input and print the reverse of the string 
-// using the internal kprintf( ) function. The return value should be 1 if the length of the string is multiple of 
-// 5 or 0 otherwise. 
+/*
+Implement a simplified system call named int reversestring(const char *str, int len) 
+This system call should accept a string and length of the string as input and print the reverse of the string 
+using the internal kprintf( ) function. The return value should be 1 if the length of the string is multiple of 
+5 or 0 otherwise. 
+*/
 
 // Lab 2: Part D
 int sys_reversestring(const char *str, int len) { 
     kprintf("Given String: %s\n", str);
-
     for (int i = len - 1; i >= 0; i--) {
         kprintf("%c", str[i]);
     }
-
     kprintf("\n");
+    
+    int isStringLenMultipleOf5 = 1;
+     (len % 5 != 0) ? isStringLenMultipleOf5 = 0 : 1;
+    kprintf("Return value: %d\n", isStringLenMultipleOf5);
 
-    return (len % 5 == 0) ? 1 : 0;
+    return isStringLenMultipleOf5;
 }
 

os161-1.99/kern/test/synchtest.c

@@ -123,7 +123,7 @@ semtestthread(void *junk, unsigned long num)
 	kprintf("\n");
 	V(donesem);
 #ifdef UW
-  thread_exit();
+  thread_exit(0);
 #endif
 }
 
@@ -176,7 +176,7 @@ fail(unsigned long num, const char *msg)
 	lock_release(testlock);
 
 	V(donesem);
-	thread_exit();
+	thread_exit(0);
 }
 
 static
@@ -220,7 +220,7 @@ locktestthread(void *junk, unsigned long num)
 	}
 	V(donesem);
 #ifdef UW
-  thread_exit();
+  thread_exit(0);
 #endif
 }
 
@@ -288,7 +288,7 @@ cvtestthread(void *junk, unsigned long num)
 				kprintf("That's too fast... you must be "
 					"busy-looping\n");
 				V(donesem);
-				thread_exit();
+				thread_exit(0);
 			}
 
 		}
@@ -306,7 +306,7 @@ cvtestthread(void *junk, unsigned long num)
 	}
 	V(donesem);
 #ifdef UW
-  thread_exit();
+  thread_exit(0);
 #endif
 }
 

os161-1.99/kern/test/uw-tests.c

@@ -84,7 +84,7 @@ add_thread(void *junk, unsigned long num)
 
 	}
 	V(donesem);
-	thread_exit();
+	thread_exit(0);
 }
 
 /* This thread substract values from a global variable. */
@@ -117,7 +117,7 @@ sub_thread(void *junk, unsigned long num)
 
 	}
 	V(donesem);
-	thread_exit();
+	thread_exit(0);
 }
 
 int
@@ -251,7 +251,7 @@ vmstats_thread(void *junk, unsigned long num)
 	}
 
 	V(donesem);
-	thread_exit();
+	thread_exit(0);
 }
 
 int

os161-1.99/kern/thread/thread.c

@@ -403,7 +403,7 @@ cpu_hatch(unsigned software_number)
 	kprintf("cpu%u: %s\n", software_number, cpu_identify());
 
 	V(cpu_startup_sem);
-	thread_exit();
+	thread_exit(0);
 }
 
 /*
@@ -765,7 +765,7 @@ thread_startup(void (*entrypoint)(void *data1, unsigned long data2),
 	entrypoint(data1, data2);
 
 	/* Done. */
-	thread_exit();
+	thread_exit(0);
 }
 
 /*
@@ -778,8 +778,10 @@ thread_startup(void (*entrypoint)(void *data1, unsigned long data2),
  * Does not return.
  */
 void
-thread_exit(void)
+thread_exit(int exitcode)
 {
+
+
 	struct thread *cur;
 
 	cur = curthread;
@@ -796,6 +798,12 @@ thread_exit(void)
 	proc_remthread(cur);
 #endif // UW
 
+	// Lab 2: Part B - Doing a spin lock so the kprintf output is not jumbled or garbled
+	spinlock_acquire(&curcpu->c_runqueue_lock); 
+	kprintf("Exiting thread with code \n");
+	kprintf("%d\n", exitcode);
+	spinlock_release(&curcpu->c_runqueue_lock);
+
 	/* Make sure we *are* detached (move this only if you're sure!) */
 	KASSERT(cur->t_proc == NULL);
 

os161-1.99/user/include/unistd.h

@@ -114,10 +114,10 @@
 #define __DEAD
 #endif
 
-// Lab 2
-int printint(int c); // Lab 2: Part C
-void _exit(int exitCode); // Lab 2: Part B
-int reversestring(const char *str, int len); // Lab 2: Part D
+// Lab 2: Part C
+int printint(int c);
+// Lab 2: Part D
+int reversestring(const char *str, int len); 
 
 /* Required. */
 __DEAD void _exit(int code);

os161-1.99/user/testbin/Makefile

@@ -8,7 +8,7 @@ TOP=../..
 SUBDIRS=add argtest badcall bigfile conman crash ctest dirconc dirseek \
 	dirtest f_test farm faulter filetest forkbomb forktest guzzle \
 	hash hog huge kitchen malloctest matmult palin parallelvm psort \
-	randcall rmdirtest rmtest sink sort sty tail testA tictac triplehuge \
+	randcall rmdirtest rmtest sink sort sty tail testExit testPrint testReverseString tictac triplehuge \
 	triplemat triplesort zero
 
 # But not:

os161-1.99/user/testbin/testExit/Makefile

@@ -0,0 +1,11 @@
+# Makefile for userthreads
+
+TOP=../../..
+.include "$(TOP)/mk/os161.config.mk"
+
+PROG=testExit
+SRCS=testExit.c
+BINDIR=/testbin
+
+.include "$(TOP)/mk/os161.prog.mk"
+

os161-1.99/user/testbin/testExit/testExit.c

@@ -0,0 +1,22 @@
+#include <unistd.h>
+#include <stdio.h>
+
+
+int exitcode = 42;
+
+
+
+int
+main()
+{
+    printf("Killing the thread\n");
+    printf("calling exit\n");
+    _exit(exitcode); // Lab 2: Part B
+
+    printf("This should not be printed since the thread is killed\n");
+    return 0;
+};
+
+
+
+

os161-1.99/user/testbin/testPrint/Makefile

@@ -0,0 +1,11 @@
+# Makefile for userthreads
+
+TOP=../../..
+.include "$(TOP)/mk/os161.config.mk"
+
+PROG=testPrint
+SRCS=testPrint.c
+BINDIR=/testbin
+
+.include "$(TOP)/mk/os161.prog.mk"
+