diff options
| author | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-25 11:51:09 -0400 |
|---|---|---|
| committer | Ian McFarlane <i.mcfarlane2002@gmail.com> | 2025-04-25 11:51:09 -0400 |
| commit | 25359ed1cb1a6131e9d3d26c8f2c8634670ed864 (patch) | |
| tree | 559750220ff5084e33a2e1f5bc4f0c90b959a4f8 /kernel/procs.c | |
| parent | fix freeing of virtual memory (diff) | |
| parent | poweroff syscall (diff) | |
| download | comus-25359ed1cb1a6131e9d3d26c8f2c8634670ed864.tar.gz comus-25359ed1cb1a6131e9d3d26c8f2c8634670ed864.tar.bz2 comus-25359ed1cb1a6131e9d3d26c8f2c8634670ed864.zip | |
resolve format conflict
Diffstat (limited to 'kernel/procs.c')
| -rw-r--r-- | kernel/procs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/procs.c b/kernel/procs.c index 9cde22f..c1bcc4f 100644 --- a/kernel/procs.c +++ b/kernel/procs.c @@ -35,7 +35,7 @@ struct pcb *init_pcb = NULL; struct pcb ptable[N_PROCS]; /// next avaliable pid -pid_t next_pid = 0; +pid_t next_pid = 1; static struct pcb *find_prev_wakeup(pcb_queue_t queue, struct pcb *pcb) { @@ -119,6 +119,7 @@ int pcb_alloc(struct pcb **pcb) if (pcb_queue_pop(pcb_freelist, &tmp) != SUCCESS) return E_NO_PCBS; + tmp->pid = next_pid++; *pcb = tmp; return SUCCESS; } @@ -461,7 +462,7 @@ void schedule(struct pcb *pcb) panic("schedule insert fail"); } -void dispatch(void) +__attribute__((noreturn)) void dispatch(void) { assert(current_pcb == NULL, "dispatch: current process is not null"); @@ -472,4 +473,6 @@ void dispatch(void) // set the process up for success current_pcb->state = PROC_STATE_RUNNING; current_pcb->ticks = 3; // ticks per process + + syscall_return(); } |