basic ptemap

Author: esteban-h5

tarea4/EH_tarea4.md

@@ -1,46 +1,34 @@
 Tarea 4 hecha por: Esteban Eduardo Hernandez Salas
 
-**Kernel de XV6 Compilado con i386-elf-gcc en unix**
-
-Utilizando el video compartido en el discord de la sección para la creacion de una llamada de sistema https://youtu.be/21SVYiKhcwM , se realizaron los siguientes Cambios a XV6:
-
-Añadido archivo getpid.c
+Añadido archivo ptemap.c
 
 En MakeFile:
-  linea 188:  [ _getprocs\ ]
-  linea 258:  [ getprocs.c\ ]
+  linea 169:  [ _ptemap\ ]
+  linea 255:  [ ptemap.c\ ]
 
 En syscall.h:
-  linea 25: [ #define SYS_getprocs  22 ]
-
-En defs.h:
-  linea 125:  [ int getprocs(void); ]
-
-En user.h:
-  linea 28: [ int getprocs(void); ]
+  linea 23: [ #define SYS_ptemap  22 ]
 
 En sysproc.c:
-  linea 94: [ int sys_getprocs (void) { return getprocs(); } ] 
+  linea 94: [ int sys_ptemap (void) { return ptemap(); } ] 
 
-En usys.S:
-  linea 32: [ SYSCALL(getprocs) ]
- 
 En syscall.c:
-  linea 107:  [ extern int sys_getprocs(void); ]
-  linea 132:  [ [SYS_getprocs] sys_getprocs, ]
+  linea 106:  [ extern int sys_ptemap(void); ]
+  linea 110:  [ [SYS_ptemap] sys_ptemap, ]
+
+En usys.S:
+  linea 32: [ SYSCALL(ptemap) ]
+
+En defs.h:
+  linea 26:  [ int ptemap(void); ]
+
+En user.h:
+  linea 28: [ int ptemap(void); ]
 
 En proc.c
   linea 536 a linea 548: 
   [
-    int getprocs() {
-
-      struct proc *p;
-      int n_procs = 0;
+    int ptemap() {
 
-      acquire(&ptable.lock);
-      for(p = ptable.proc; p < &ptable.proc[NPROC]; p++) if(p->state != UNUSED) n_procs++;
-      release(&ptable.lock);
- 
-      return n_procs;
     }
   ]

tarea4/memcheck.c renamed to tarea4/ptemap.c

@@ -6,13 +6,13 @@
 //#include "spinlock.h"
 //#include "param.h"
 /*
-int memcheck(int num){
+int ptemap(int num){
 	return num*10;
 }
 */
 
 int main(int argc, char** argv){
 	printf(1,"\nArgumentos: %d\n",argc);
-	for(int i = 0; i < argc; i++) printf(1,"Valor: %s\nMemcheck: %d\n\n",argv[i],memcheck((int)argv[i]));
+	for(int i = 0; i < argc; i++) printf(1,"Valor: %s\nMemcheck: %d\n\n",argv[i],ptemap());
 	return 0;
 }

tarea4/xv6-tarea4/Makefile

@@ -166,7 +166,7 @@ mkfs: mkfs.c fs.h
 .PRECIOUS: %.o
 
 UPROGS=\
-	_memcheck\
+	_ptemap\
 	_cat\
 	_echo\
 	_forktest\
@@ -251,7 +251,8 @@ 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\
-	printf.c umalloc.c memcheck.c\
+	printf.c umalloc.c\
+  ptemap.c\
 	README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
 	.gdbinit.tmpl gdbutil\
 

tarea4/xv6-tarea4/defs.h

@@ -134,7 +134,7 @@ void            pushcli(void);
 void            popcli(void);
 
 //memcheck.c
-int		memcheck(int);
+int		          ptemap(void);
 
 // sleeplock.c
 void            acquiresleep(struct sleeplock*);

tarea4/xv6-tarea4/proc.c

@@ -534,8 +534,7 @@ procdump(void)
   }
 }
 
-int memcheck(int arg){
-	num = arg;
-	return num*10;
+int ptemap(void){
+	return 0;
 }
 

tarea4/xv6-tarea4/memcheck.c renamed to tarea4/xv6-tarea4/ptemap.c

@@ -6,13 +6,13 @@
 //#include "spinlock.h"
 //#include "param.h"
 /*
-int memcheck(int num){
+int ptemap(int num){
 	return num*10;
 }
 */
 
 int main(int argc, char** argv){
 	printf(1,"\nArgumentos: %d\n",argc);
-	for(int i = 0; i < argc; i++) printf(1,"Valor: %s\nMemcheck: %d\n\n",argv[i],memcheck((int)argv[i]));
+	for(int i = 0; i < argc; i++) printf(1,"Valor: %s\nMemcheck: %d\n\n",argv[i],ptemap());
 	return 0;
 }

tarea4/xv6-tarea4/syscall.c

@@ -103,11 +103,11 @@ extern int sys_unlink(void);
 extern int sys_wait(void);
 extern int sys_write(void);
 extern int sys_uptime(void);
-extern int sys_memcheck(void);
+extern int sys_ptemap(void);
 
 
 static int (*syscalls[])(void) = {
-[SYS_memcheck]	sys_memcheck,
+[SYS_memcheck]	sys_ptemap,
 [SYS_fork]    sys_fork,
 [SYS_exit]    sys_exit,
 [SYS_wait]    sys_wait,

tarea4/xv6-tarea4/syscall.h

@@ -20,4 +20,4 @@
 #define SYS_link   19
 #define SYS_mkdir  20
 #define SYS_close  21
-#define SYS_memcheck	22
+#define SYS_ptemap	22

tarea4/xv6-tarea4/user.h

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

tarea4/xv6-tarea4/usys.S

@@ -29,4 +29,4 @@ SYSCALL(getpid)
 SYSCALL(sbrk)
 SYSCALL(sleep)
 SYSCALL(uptime)
-SYSCALL(memcheck)
+SYSCALL(ptemap)