SyscallCounter syscall and SyscallCounter Test added to project.

Author: erfanghasemi

Makefile

@@ -183,6 +183,7 @@ UPROGS=\
 	_zombie\
 	_getParentIDtest\
 	_getChildrentest\
+	_getSyscallCounterTest\
 
 fs.img: mkfs README $(UPROGS)
 	./mkfs fs.img README $(UPROGS)
@@ -255,6 +256,7 @@ EXTRA=\
 	printf.c umalloc.c\
 	getParentIDtest.c\
 	getChildrentest.c\
+	getSyscallCounterTest.c\
 	README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
 	.gdbinit.tmpl gdbutil\
 

defs.h

@@ -120,8 +120,9 @@ void            userinit(void);
 int             wait(void);
 void            wakeup(void*);
 void            yield(void);
-int             getparentid(void);
-int             getChildren(char* ptr);
+int             getparentid(void);         // (Added)
+int             getChildren(char* ptr);    // (Added)
+int             getSyscallCounter(int syscallNo);    // (Added)
 
 // swtch.S
 void            swtch(struct context**, struct context*);

getSyscallCounterTest.c

@@ -0,0 +1,36 @@
+# include "types.h"
+# include "stat.h"
+# include "user.h"
+
+
+int main(void)
+{
+    int p;
+
+    printf(1, "Parent process sys_fork count = %d\n", getSyscallCounter(1));
+    
+    p = fork();
+
+    if (p == 0)
+    {
+        printf(1, "Child process sys_fork count = %d\n", getSyscallCounter(1));
+
+        for (int i = 0; i < 16; i++)
+            getpid();
+
+        printf(1, "child sys_getpid count %d\n", getSyscallCounter(11));
+    }
+    else
+    {
+        wait();
+        printf(1, "parent fork count %d\n", getSyscallCounter(1));
+        sleep(1);
+        printf(1, "parent sys_sleep count %d\n", getSyscallCounter(13));
+    }
+    printf(1, "process sys_wait count = %d\n", getSyscallCounter(3));
+    printf(1, "process sys_syscallcounter count = %d\n", getSyscallCounter(24));
+    
+    exit();
+
+    return 0;
+}

proc.c

@@ -533,6 +533,7 @@ procdump(void)
   }
 }
 
+// return parent ID of a process (Added)
 int
 getparentid(void)
 {
@@ -541,6 +542,7 @@ getparentid(void)
   return chlid_pid;
 }
 
+// return children ID of a process (Added)
 int
 getChildren(char * ptr)
 {
@@ -557,4 +559,15 @@ getChildren(char * ptr)
     }
   }
   return 1;
+}
+
+// return occurrence of a syscall for current process (Added)
+int
+getSyscallCounter(int syscallNo){
+
+  struct proc *curproc = myproc();
+  int occurrence;
+
+  occurrence = curproc->syscall_occurrence[syscallNo-1];
+  return occurrence;
 }

proc.h

@@ -49,6 +49,7 @@ struct proc {
   struct file *ofile[NOFILE];  // Open files
   struct inode *cwd;           // Current directory
   char name[16];               // Process name (debugging)
+  int syscall_occurrence[24];  // save occurrence of each syscall (Added)
 };
 
 // Process memory is laid out contiguously, low addresses first:

syscall.c

@@ -103,8 +103,9 @@ extern int sys_unlink(void);
 extern int sys_wait(void);
 extern int sys_write(void);
 extern int sys_uptime(void);
-extern int sys_getparentid(void);
-extern int sys_getChildren(void);
+extern int sys_getparentid(void);  // Added
+extern int sys_getChildren(void);  // Added
+extern int sys_getSyscallCounter(void);  // Added
 
 static int (*syscalls[])(void) = {
 [SYS_fork]    sys_fork,
@@ -128,8 +129,9 @@ static int (*syscalls[])(void) = {
 [SYS_link]    sys_link,
 [SYS_mkdir]   sys_mkdir,
 [SYS_close]   sys_close,
-[SYS_getparentid]  sys_getparentid,
-[SYS_getChildren]  sys_getChildren
+[SYS_getparentid]  sys_getparentid,   // (Added)
+[SYS_getChildren]  sys_getChildren,    // (Added)
+[SYS_getSyscallCounter]  sys_getSyscallCounter  // (Added)
 };
 
 void
@@ -140,6 +142,7 @@ syscall(void)
 
   num = curproc->tf->eax;
   if(num > 0 && num < NELEM(syscalls) && syscalls[num]) {
+    curproc->syscall_occurrence[num-1]++;  // (Added)
     curproc->tf->eax = syscalls[num]();
   } else {
     cprintf("%d %s: unknown sys call %d\n",

syscall.h

@@ -20,5 +20,6 @@
 #define SYS_link   19
 #define SYS_mkdir  20
 #define SYS_close  21
-#define SYS_getparentid  22
-#define SYS_getChildren 23
+#define SYS_getparentid  22     // (Added)
+#define SYS_getChildren 23      // (Added)
+#define SYS_getSyscallCounter 24    // (Added)

sysfile.c

@@ -421,7 +421,7 @@ sys_exec(void)
 
 int
 sys_pipe(void)
-{
+{ 
   int *fd;
   struct file *rf, *wf;
   int fd0, fd1;

sysproc.c

@@ -15,7 +15,7 @@ sys_fork(void)
 
 int
 sys_exit(void)
-{
+{ 
   exit();
   return 0;  // not reached
 }
@@ -28,8 +28,8 @@ sys_wait(void)
 
 int
 sys_kill(void)
-{
-  int pid;
+{ 
+ int pid;
 
   if(argint(0, &pid) < 0)
     return -1;
@@ -38,13 +38,13 @@ sys_kill(void)
 
 int
 sys_getpid(void)
-{
+{ 
   return myproc()->pid;
 }
 
 int
 sys_sbrk(void)
-{
+{ 
   int addr;
   int n;
 
@@ -81,7 +81,7 @@ sys_sleep(void)
 // since start.
 int
 sys_uptime(void)
-{
+{ 
   uint xticks;
 
   acquire(&tickslock);
@@ -90,12 +90,14 @@ sys_uptime(void)
   return xticks;
 }
 
+// return parent ID of a process (Added)
 int
 sys_getparentid(void)
 {
   return getparentid();
 }
 
+// return children ID of a process (Added)
 int
 sys_getChildren(void)
 {
@@ -106,4 +108,16 @@ sys_getChildren(void)
 
   getChildren(ptr);
   return 1;
+}
+
+// return occurrence of a syscall for current process (Added)
+int
+sys_getSyscallCounter()
+{
+  int syscallNo;
+
+  if(argint(0, &syscallNo) < 0)
+    return -1;
+
+  return getSyscallCounter(syscallNo);
 }

user.h

@@ -23,8 +23,9 @@ int getpid(void);
 char* sbrk(int);
 int sleep(int);
 int uptime(void);
-int getparentid(void);
-int getChildren(char* ptr);
+int getparentid(void);          // (Added)
+int getChildren(char* ptr);     // (Added)
+int getSyscallCounter(int syscallNo);    // (Added)
 
 // ulib.c
 int stat(const char*, struct stat*);

usys.S

@@ -30,4 +30,5 @@ SYSCALL(sbrk)
 SYSCALL(sleep)
 SYSCALL(uptime)
 SYSCALL(getparentid)
-SYSCALL(getChildren)
+SYSCALL(getChildren) 
+SYSCALL(getSyscallCounter)