diff options
| author | Mole Shang <[email protected]> | 2024-02-10 13:46:25 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-10 13:50:34 +0800 |
| commit | 3673a2cdfb30e1e3936e695a3fb8adee74488d6b (patch) | |
| tree | 282b4677f47bbb15949e24b3bfa455b173a38a29 /kernel/proc.h | |
| parent | f379c1c4c80947365eb6c4046c3ab165629dc8cd (diff) | |
| parent | c9284cd93525436cc823258ab309c1b27eeec714 (diff) | |
| download | xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.gz xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.bz2 xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.zip | |
Merge branch 'pgtbl' into traps
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to 'kernel/proc.h')
| -rw-r--r-- | kernel/proc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/proc.h b/kernel/proc.h index d021857..c816ae2 100644 --- a/kernel/proc.h +++ b/kernel/proc.h @@ -91,6 +91,7 @@ struct proc { int killed; // If non-zero, have been killed int xstate; // Exit status to be returned to parent's wait int pid; // Process ID + int trace_mask; // SYS_trace mask (1 << SYS_xxx) // wait_lock must be held when using this: struct proc *parent; // Parent process @@ -100,6 +101,7 @@ struct proc { uint64 sz; // Size of process memory (bytes) pagetable_t pagetable; // User page table struct trapframe *trapframe; // data page for trampoline.S + struct usyscall *usyscall; // data page for usyscall struct context context; // swtch() here to run process struct file *ofile[NOFILE]; // Open files struct inode *cwd; // Current directory |