From 283d5ab4c964ab525e45fcade06d6fd7e977c43e Mon Sep 17 00:00:00 2001
From: Mole Shang <135e2@135e2.dev>
Date: Thu, 18 Jan 2024 17:35:27 +0800
Subject: lab syscall: finish

Conflicts:
	kernel/syscall.c
	kernel/syscall.h
	user/user.h
	user/usys.pl
---
 kernel/proc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'kernel/proc.h')

diff --git a/kernel/proc.h b/kernel/proc.h
index d021857..4a2ca6c 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
-- 
cgit v1.2.3


From c9284cd93525436cc823258ab309c1b27eeec714 Mon Sep 17 00:00:00 2001
From: Mole Shang <135e2@135e2.dev>
Date: Sat, 10 Feb 2024 13:08:26 +0800
Subject: lab pgtbl: finish

---
 kernel/proc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'kernel/proc.h')

diff --git a/kernel/proc.h b/kernel/proc.h
index 4a2ca6c..c816ae2 100644
--- a/kernel/proc.h
+++ b/kernel/proc.h
@@ -101,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
-- 
cgit v1.2.3


From 48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 Mon Sep 17 00:00:00 2001
From: Mole Shang <135e2@135e2.dev>
Date: Sun, 11 Feb 2024 14:41:35 +0800
Subject: lab traps: finish

---
 kernel/proc.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'kernel/proc.h')

diff --git a/kernel/proc.h b/kernel/proc.h
index c816ae2..a195b02 100644
--- a/kernel/proc.h
+++ b/kernel/proc.h
@@ -106,4 +106,9 @@ struct proc {
   struct file *ofile[NOFILE];  // Open files
   struct inode *cwd;           // Current directory
   char name[16];               // Process name (debugging)
+  int alarm_interval;          // sigalarm syscall interval
+  uint64 alarm_handler;        // sigalarm syscall handler
+  int alarm_tickspassed;       // record how many ticks passed since last sigalarm handler call
+  int alarm_caninvoke;         // prevent re-entrant calls to handler
+  struct trapframe *atpfm;     // trapframe to resume after handling, must hold p->lock
 };
-- 
cgit v1.2.3