getChildren syscall and getChildren test added to project.

Author: erfanghasemi

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.tcc": "c",
+        "cstdio": "c"
+    }
+}

Makefile

@@ -182,6 +182,7 @@ UPROGS=\
 	_wc\
 	_zombie\
 	_getParentIDtest\
+	_getChildrentest\
 
 fs.img: mkfs README $(UPROGS)
 	./mkfs fs.img README $(UPROGS)
@@ -253,6 +254,7 @@ EXTRA=\
 	ln.c ls.c mkdir.c rm.c stressfs.c usertests.c wc.c zombie.c\
 	printf.c umalloc.c\
 	getParentIDtest.c\
+	getChildrentest.c\
 	README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
 	.gdbinit.tmpl gdbutil\
 

defs.h

@@ -121,6 +121,7 @@ int             wait(void);
 void            wakeup(void*);
 void            yield(void);
 int             getparentid(void);
+int             getChildren(char* ptr);
 
 // swtch.S
 void            swtch(struct context**, struct context*);

getChildrentest.c

@@ -0,0 +1,51 @@
+# include "types.h"
+# include "stat.h"
+# include "user.h"
+
+
+void printChildren(char* children);
+
+int main(void)
+{
+    int p = 0;
+    char* ptr = (char*)malloc(64 * sizeof(int)); 
+
+    p = fork();
+
+    for (int i = 0; i < 7; i++)
+    {   
+        if(p != 0)
+        {
+            p = fork();
+        }
+    }
+    
+    if(p != 0){
+        getChildren(ptr);
+        printChildren(ptr);
+    }
+
+    for (int i = 0; i < 8; i++)
+    {
+        wait();
+    }
+
+    exit();
+
+    return 0; 
+}
+
+void
+printChildren(char* children)
+{   
+    int i = 0;
+
+    printf(1, "This is process %d and children are : ", getpid());
+
+    while (children[i] != 0)
+    {
+        printf(1, "%d/ ", children[i]);
+        i++;
+    }
+    printf(1, "\n");
+}

getParentIDtest.c

@@ -7,33 +7,33 @@ int main()
     int p;
 
     printf(1, "--------------Start Testing--------------\n");
-    printf(1, "This is process %d and the parent id is %d\n", getpid(), getparentid());
+    printf(1, "This is process %d and the parent id is %d.\n", getpid(), getparentid());
     p = fork();
 
     if(p == 0)
     {    
         printf(1, "----------------Step One----------------\n");
-        printf(1, "This is process %d and the parent id is %d\n", getpid(), getparentid());
+        printf(1, "This is process %d and the parent id is %d.\n", getpid(), getparentid());
 
         p = fork();
 
         if(p == 0)
         {
             printf(1, "----------------Step two----------------\n");
-            printf(1, "This is process %d and the parent id is %d\n", getpid(), getparentid());
+            printf(1, "This is process %d and the parent id is %d.\n", getpid(), getparentid());
 
             p = fork();
             if(p == 0)
             {
-                printf(1, "----------------Step three----------------\n");
-                printf(1, "This is process %d and the parent id is %d\n", getpid(), getparentid());
+                printf(1, "---------------Step three---------------\n");
+                printf(1, "This is process %d and the parent id is %d.\n", getpid(), getparentid());
             }
 
             wait();
         }
         wait();
     }
     wait();
-
+    exit();
     return 0;
 }

proc.c

@@ -539,4 +539,22 @@ getparentid(void)
   struct proc *curproc = myproc();
   int chlid_pid = curproc->parent->pid;
   return chlid_pid;
+}
+
+int
+getChildren(char * ptr)
+{
+  struct proc *curproc = myproc();
+  struct proc *p;
+  int i = 0;
+
+  for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
+  {
+    if(p->parent == curproc)
+    { 
+      ptr[i] = p->pid;
+      i++; 
+    }
+  }
+  return 1;
 }

syscall.c

@@ -104,6 +104,7 @@ 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);
 
 static int (*syscalls[])(void) = {
 [SYS_fork]    sys_fork,
@@ -127,7 +128,8 @@ static int (*syscalls[])(void) = {
 [SYS_link]    sys_link,
 [SYS_mkdir]   sys_mkdir,
 [SYS_close]   sys_close,
-[SYS_getparentid]  sys_getparentid
+[SYS_getparentid]  sys_getparentid,
+[SYS_getChildren]  sys_getChildren
 };
 
 void

syscall.h

@@ -21,3 +21,4 @@
 #define SYS_mkdir  20
 #define SYS_close  21
 #define SYS_getparentid  22
+#define SYS_getChildren 23

sysproc.c

@@ -94,4 +94,16 @@ int
 sys_getparentid(void)
 {
   return getparentid();
+}
+
+int
+sys_getChildren(void)
+{
+  char * ptr;
+
+  if(argptr(0, &ptr, 4) < 0)
+    return -1;
+
+  getChildren(ptr);
+  return 1;
 }

user.h

@@ -24,6 +24,7 @@ char* sbrk(int);
 int sleep(int);
 int uptime(void);
 int getparentid(void);
+int getChildren(char* ptr);
 
 // ulib.c
 int stat(const char*, struct stat*);

usys.S

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