diff options
| author | Mole Shang <[email protected]> | 2024-02-16 10:20:27 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-16 10:20:27 +0800 |
| commit | a98c56a811142e5ede3332a7a444cca45f628769 (patch) | |
| tree | c93ff7090da7b6ef911932be283818c2f6a03784 /user/user.h | |
| parent | 0d65be5d1d880afafbf08c2adb605cf9f72216e2 (diff) | |
| parent | 99015f3a985b2fd051606636743a2a2969b216e8 (diff) | |
| download | xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.gz xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.bz2 xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.zip | |
Merge branch 'lock' into thread
Conflicts:
.gitignore
Makefile
conf/lab.mk
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); |