diff options
| author | Mole Shang <[email protected]> | 2024-02-17 11:55:33 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-17 12:22:07 +0800 |
| commit | e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd (patch) | |
| tree | fb42ba5be7a8ae608b968266f62fd71fa889a89d /user/user.h | |
| parent | a6af72924b115c1177d18d9b1eaba56623e4248b (diff) | |
| parent | d85aec2689c4250d0384904bdc11aa618c726bec (diff) | |
| download | xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.gz xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.bz2 xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.zip | |
Merge branch 'thread' into fs
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/param.h
Diffstat (limited to 'user/user.h')
| -rw-r--r-- | user/user.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/user/user.h b/user/user.h index 4d398d5..3544ac4 100644 --- a/user/user.h +++ b/user/user.h @@ -1,4 +1,9 @@ +#ifdef LAB_MMAP +typedef unsigned long size_t; +typedef long int off_t; +#endif struct stat; +struct sysinfo; // system calls int fork(void); @@ -22,6 +27,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 +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); |