Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / src / lib / user / syscall.h

diff --git a/src/lib/user/syscall.h b/src/lib/user/syscall.h
index 188576d35edbe205507fa2d61e6dc4644014be87..c2941087faa09de8dca3c6f434fbcf0f35aea99f 100644 (file)
--- a/src/lib/user/syscall.h
+++ b/src/lib/user/syscall.h
@@ -7,10 +7,13 @@
 typedef int pid_t;
 #define PID_ERROR ((pid_t) -1)
 
+typedef int mapid_t;
+#define MAP_FAILED ((mapid_t) -1)
+
 void halt (void) NO_RETURN;
 void exit (int status) NO_RETURN;
 pid_t exec (const char *file);
-int join (pid_t);
+int wait (pid_t);
 bool create (const char *file, unsigned initial_size);
 bool remove (const char *file);
 int open (const char *file);
@@ -20,8 +23,8 @@ int write (int fd, const void *buffer, unsigned length);
 void seek (int fd, unsigned position);
 unsigned tell (int fd);
 void close (int fd);
-bool mmap (int fd, void *addr, unsigned length);
-bool munmap (void *addr, unsigned length);
+mapid_t mmap (int fd, void *addr);
+bool munmap (mapid_t);
 bool chdir (const char *dir);
 bool mkdir (const char *dir);
 void lsdir (void);