Tarea 1

Makefile

@@ -181,6 +181,7 @@ UPROGS=\
 	_usertests\
 	_wc\
 	_zombie\
+	_cuenta\
 
 fs.img: mkfs README $(UPROGS)
 	./mkfs fs.img README $(UPROGS)
@@ -250,6 +251,7 @@ qemu-nox-gdb: fs.img xv6.img .gdbinit
 EXTRA=\
 	mkfs.c ulib.c user.h cat.c echo.c forktest.c grep.c kill.c\
 	ln.c ls.c mkdir.c rm.c stressfs.c usertests.c wc.c zombie.c\
+	cuenta.c\
 	printf.c umalloc.c\
 	README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
 	.gdbinit.tmpl gdbutil\

cuenta.c

@@ -0,0 +1,9 @@
+#include "types.h"
+#include "stat.h"
+#include "user.h"
+#include "fcntl.h"
+
+int main(void) {
+printf(1 , "La cantidad de procesos en ejecucion en la CPU es %d\n", getprocs());
+exit();
+}

defs.h

@@ -120,6 +120,7 @@ void            userinit(void);
 int             wait(void);
 void            wakeup(void*);
 void            yield(void);
+int             countproc(void);
 
 // swtch.S
 void            swtch(struct context**, struct context*);

proc.c

@@ -532,3 +532,21 @@ procdump(void)
     cprintf("\n");
   }
 }
+
+int
+countproc(void)
+{
+  struct proc *p;
+  int counter = 0;
+  acquire(&ptable.lock);
+
+  for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
+    if(p->state != UNUSED){
+      counter++;
+    }
+  }
+
+  release(&ptable.lock);
+
+  return counter;
+}

syscall.c

@@ -103,6 +103,7 @@ extern int sys_unlink(void);
 extern int sys_wait(void);
 extern int sys_write(void);
 extern int sys_uptime(void);
+extern int sys_getprocs(void);
 
 static int (*syscalls[])(void) = {
 [SYS_fork]    sys_fork,
@@ -126,6 +127,7 @@ static int (*syscalls[])(void) = {
 [SYS_link]    sys_link,
 [SYS_mkdir]   sys_mkdir,
 [SYS_close]   sys_close,
+[SYS_getprocs] sys_getprocs,
 };
 
 void
@@ -143,3 +145,4 @@ syscall(void)
     curproc->tf->eax = -1;
   }
 }
+

syscall.h

@@ -20,3 +20,4 @@
 #define SYS_link   19
 #define SYS_mkdir  20
 #define SYS_close  21
+#define SYS_getprocs  22

sysproc.c

@@ -42,6 +42,12 @@ sys_getpid(void)
   return myproc()->pid;
 }
 
+int
+sys_getprocs(void)
+{
+  return countproc();
+}
+
 int
 sys_sbrk(void)
 {
@@ -89,3 +95,4 @@ sys_uptime(void)
   release(&tickslock);
   return xticks;
 }
+

user.h

@@ -23,6 +23,7 @@ int getpid(void);
 char* sbrk(int);
 int sleep(int);
 int uptime(void);
+int getprocs(void);
 
 // ulib.c
 int stat(const char*, struct stat*);

usys.S

@@ -29,3 +29,4 @@ SYSCALL(getpid)
 SYSCALL(sbrk)
 SYSCALL(sleep)
 SYSCALL(uptime)
+SYSCALL(getprocs)