diff options
| author | Mole Shang <[email protected]> | 2024-02-11 14:44:22 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-11 16:06:15 +0800 |
| commit | 2fe04bc8faa4bf737a86c36a8017473e84814f3b (patch) | |
| tree | 2146d3dae86f21060e2e807ad364f5a949fd1c53 /user/user.h | |
| parent | 5ce1f630132d8b7b35b9dc46b4a55f860eb85d5c (diff) | |
| parent | 48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 (diff) | |
| download | xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.gz xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.bz2 xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.zip | |
Merge branch 'traps' into cow
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to 'user/user.h')
| -rw-r--r-- | user/user.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/user/user.h b/user/user.h index 4d398d5..34591fd 100644 --- a/user/user.h +++ b/user/user.h @@ -1,4 +1,5 @@ struct stat; +struct sysinfo; // system calls int fork(void); @@ -22,6 +23,18 @@ 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 +int trace(int); +int sysinfo(struct sysinfo*); +int sigalarm(int ticks, void (*handler)()); +int sigreturn(void); // ulib.c int stat(const char*, struct stat*); @@ -39,3 +52,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); |