From 18998096701a1d4695b2097006d7afc2a539bd89 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Fri, 8 Sep 2023 09:24:27 -0400 Subject: 3rd lab --- user/user.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index 4d398d5..16cf173 100644 --- a/user/user.h +++ b/user/user.h @@ -22,6 +22,14 @@ int getpid(void); char* sbrk(int); int sleep(int); int uptime(void); +#ifdef LAB_NET +int connect(uint32, uint16, uint16); +#endif +#ifdef LAB_PGTBL +int pgaccess(void *base, int len, void *mask); +// usyscall region +int ugetpid(void); +#endif // ulib.c int stat(const char*, struct stat*); @@ -39,3 +47,4 @@ void free(void*); int atoi(const char*); int memcmp(const void *, const void *, uint); void *memcpy(void *, const void *, uint); +int statistics(void*, int); -- cgit v1.2.3 From 3808f903625f42f58aa95e43e3caca3efaa4d118 Mon Sep 17 00:00:00 2001 From: Sanjit Bhat Date: Mon, 30 Oct 2023 14:39:28 -0500 Subject: lock: release lab --- user/user.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index 4d398d5..16cf173 100644 --- a/user/user.h +++ b/user/user.h @@ -22,6 +22,14 @@ int getpid(void); char* sbrk(int); int sleep(int); int uptime(void); +#ifdef LAB_NET +int connect(uint32, uint16, uint16); +#endif +#ifdef LAB_PGTBL +int pgaccess(void *base, int len, void *mask); +// usyscall region +int ugetpid(void); +#endif // ulib.c int stat(const char*, struct stat*); @@ -39,3 +47,4 @@ void free(void*); int atoi(const char*); int memcmp(const void *, const void *, uint); void *memcpy(void *, const void *, uint); +int statistics(void*, int); -- cgit v1.2.3 From 3c0a25fc4383140b3f8bf83f5eef4cbb14062e94 Mon Sep 17 00:00:00 2001 From: Robert Morris Date: Tue, 2 Jan 2024 10:04:23 -0500 Subject: x --- user/user.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index 16cf173..2d6ace6 100644 --- a/user/user.h +++ b/user/user.h @@ -1,3 +1,7 @@ +#ifdef LAB_MMAP +typedef unsigned long size_t; +typedef long int off_t; +#endif struct stat; // system calls @@ -47,4 +51,6 @@ void free(void*); int atoi(const char*); int memcmp(const void *, const void *, uint); void *memcpy(void *, const void *, uint); +#ifdef LAB_LOCK int statistics(void*, int); +#endif -- cgit v1.2.3 From 283d5ab4c964ab525e45fcade06d6fd7e977c43e Mon Sep 17 00:00:00 2001 From: Mole Shang <135e2@135e2.dev> Date: Thu, 18 Jan 2024 17:35:27 +0800 Subject: lab syscall: finish Conflicts: kernel/syscall.c kernel/syscall.h user/user.h user/usys.pl --- user/user.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index 16cf173..a076f37 100644 --- a/user/user.h +++ b/user/user.h @@ -1,4 +1,5 @@ struct stat; +struct sysinfo; // system calls int fork(void); @@ -30,6 +31,8 @@ int pgaccess(void *base, int len, void *mask); // usyscall region int ugetpid(void); #endif +int trace(int); +int sysinfo(struct sysinfo*); // ulib.c int stat(const char*, struct stat*); -- cgit v1.2.3 From 48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 Mon Sep 17 00:00:00 2001 From: Mole Shang <135e2@135e2.dev> Date: Sun, 11 Feb 2024 14:41:35 +0800 Subject: lab traps: finish --- user/user.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index a076f37..34591fd 100644 --- a/user/user.h +++ b/user/user.h @@ -33,6 +33,8 @@ int ugetpid(void); #endif int trace(int); int sysinfo(struct sysinfo*); +int sigalarm(int ticks, void (*handler)()); +int sigreturn(void); // ulib.c int stat(const char*, struct stat*); -- cgit v1.2.3 From 99015f3a985b2fd051606636743a2a2969b216e8 Mon Sep 17 00:00:00 2001 From: Mole Shang <135e2@135e2.dev> Date: Fri, 16 Feb 2024 10:05:03 +0800 Subject: lab lock/bcache: finish --- user/user.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user/user.h') diff --git a/user/user.h b/user/user.h index 31453f5..3544ac4 100644 --- a/user/user.h +++ b/user/user.h @@ -56,4 +56,6 @@ void free(void*); int atoi(const char*); int memcmp(const void *, const void *, uint); void *memcpy(void *, const void *, uint); + +// statistics.c int statistics(void*, int); -- cgit v1.2.3