diff options
| author | Mole Shang <[email protected]> | 2024-02-14 20:46:23 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-14 20:46:23 +0800 |
| commit | f98eeb30507040dc916b2a337818830954ee1d4a (patch) | |
| tree | a741cb0bbd6be96d8084e72b4af895ac093a2b48 /user/user.h | |
| parent | 0de5ac779602f562a038e5ad27163d85bc71638b (diff) | |
| parent | 904885a96efd1dd0221585f67477f5a39bcce7f7 (diff) | |
| download | xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.tar.gz xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.tar.bz2 xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.zip | |
Merge branch 'net' into lock
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
user/user.h
Diffstat (limited to 'user/user.h')
| -rw-r--r-- | user/user.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/user/user.h b/user/user.h index 2d6ace6..31453f5 100644 --- a/user/user.h +++ b/user/user.h @@ -3,6 +3,7 @@ typedef unsigned long size_t; typedef long int off_t; #endif struct stat; +struct sysinfo; // system calls int fork(void); @@ -34,6 +35,10 @@ 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*); @@ -51,6 +56,4 @@ 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 |