Disable kernel preemption, fix requesting rescheduling
All checks were successful
Build documentation / build-and-deploy (push) Successful in 29s
All checks were successful
Build documentation / build-and-deploy (push) Successful in 29s
This commit is contained in:
@@ -289,7 +289,7 @@ static void proc_reap (void) {
|
||||
}
|
||||
}
|
||||
|
||||
void proc_sched (void* regs) {
|
||||
void proc_sched (void) {
|
||||
spin_lock_ctx_t ctxcpu, ctxpr;
|
||||
|
||||
int s_cycles = atomic_fetch_add (&sched_cycles, 1);
|
||||
@@ -303,15 +303,13 @@ void proc_sched (void* regs) {
|
||||
spin_lock (&cpu->lock, &ctxcpu);
|
||||
|
||||
struct proc* prev = cpu->proc_current;
|
||||
next = proc_find_sched (cpu);
|
||||
|
||||
if (prev != NULL) {
|
||||
spin_lock (&prev->lock, &ctxpr);
|
||||
memcpy (&prev->pdata.regs, regs, sizeof (struct saved_regs));
|
||||
memcpy (&prev->pdata.regs, &cpu->regs, sizeof (struct saved_regs));
|
||||
spin_unlock (&prev->lock, &ctxpr);
|
||||
}
|
||||
|
||||
next = proc_find_sched (cpu);
|
||||
|
||||
if (next) {
|
||||
cpu->proc_current = next;
|
||||
spin_unlock (&cpu->lock, &ctxcpu);
|
||||
@@ -348,7 +346,7 @@ void proc_kill (struct proc* proc) {
|
||||
|
||||
static void proc_irq_sched (void* arg, void* regs) {
|
||||
(void)arg;
|
||||
proc_sched (regs);
|
||||
proc_sched ();
|
||||
}
|
||||
|
||||
static void proc_kpproc_init (void) {
|
||||
@@ -405,8 +403,8 @@ static void proc_kpproc_init (void) {
|
||||
|
||||
void proc_init (void) {
|
||||
#if defined(__x86_64__)
|
||||
irq_attach (&proc_irq_sched, NULL, SCHED_PREEMPT_TIMER, IRQ_INTERRUPT_SAFE);
|
||||
irq_attach (&proc_irq_sched, NULL, CPU_REQUEST_SCHED, IRQ_INTERRUPT_SAFE);
|
||||
irq_attach (&proc_irq_sched, NULL, SCHED_PREEMPT_TIMER);
|
||||
irq_attach (&proc_irq_sched, NULL, CPU_REQUEST_SCHED);
|
||||
#endif
|
||||
|
||||
proc_kpproc_init ();
|
||||
|
||||
@@ -60,7 +60,7 @@ struct proc {
|
||||
struct proc_resources* resources;
|
||||
};
|
||||
|
||||
void proc_sched (void* regs);
|
||||
void proc_sched (void);
|
||||
void proc_kill (struct proc* proc);
|
||||
bool proc_map (struct proc* proc, uintptr_t start_paddr, uintptr_t start_vaddr, size_t pages,
|
||||
uint32_t flags);
|
||||
|
||||
Reference in New Issue
Block a user