mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-02 07:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: better define wakeup reasons

Browse Source
This commit is contained in:
Matheus
2024-03-30 18:39:26 -03:00
parent 84c20586c2
commit 52ab80bc9a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/scheduler.h
+3
View File
@@ -16,6 +16,9 @@
#define SCHED_PROC_STATE_NORMAL 0 #define SCHED_PROC_STATE_NORMAL 0
#define SCHED_PROC_STATE_ZOMBIE 1 #define SCHED_PROC_STATE_ZOMBIE 1
#define SCHED_WAKEUP_REASON_NORMAL 0
#define SCHED_WAKEUP_REASON_INTERRUPTED -1
#define STACK_TOP (void *)0x0000800000000000 #define STACK_TOP (void *)0x0000800000000000
#define INTERP_BASE (void *)0x00000beef0000000 #define INTERP_BASE (void *)0x00000beef0000000
kernel-src/io/keyboard.c
+1 -1
View File
@@ -113,7 +113,7 @@ void keyboard_sendpacket(keyboard_t *kb, kbpacket_t *packet) {
int keyboard_wait(keyboard_t *kb, kbpacket_t *packet) { int keyboard_wait(keyboard_t *kb, kbpacket_t *packet) {
int e = semaphore_wait(&kb->semaphore, true); int e = semaphore_wait(&kb->semaphore, true);
if (e == EINTR) if (e == SCHED_WAKEUP_REASON_INTERRUPTED)
return e; return e;
long ipl = interrupt_raiseipl(IPL_KEYBOARD); long ipl = interrupt_raiseipl(IPL_KEYBOARD);
kernel-src/sys/scheduler.c
+1 -1
View File
@@ -296,7 +296,7 @@ void sched_wakeup(thread_t *thread, int reason) {
bool intstate = interrupt_set(false); bool intstate = interrupt_set(false);
spinlock_acquire(&thread->sleeplock); spinlock_acquire(&thread->sleeplock);
if ((thread->flags & SCHED_THREAD_FLAGS_SLEEP) == 0 || (reason == EINTR && (thread->flags & SCHED_THREAD_FLAGS_INTERRUPTIBLE) == 0)) { if ((thread->flags & SCHED_THREAD_FLAGS_SLEEP) == 0 || ((reason == SCHED_WAKEUP_REASON_INTERRUPTED) && (thread->flags & SCHED_THREAD_FLAGS_INTERRUPTIBLE) == 0)) {
spinlock_release(&thread->sleeplock); spinlock_release(&thread->sleeplock);
interrupt_set(intstate); interrupt_set(intstate);
return; return;