From 6c9cb0bd8ceb039ce387c850e25adc6f99cfcd6f Mon Sep 17 00:00:00 2001 From: Anton Kling Date: Wed, 21 Feb 2024 19:41:51 +0100 Subject: Kerenel: Cleanup halt checking code --- kernel/sched/scheduler.c | 42 ++++++++++++++++++++++++++++++++++++++++++ kernel/sched/scheduler.h | 1 - 2 files changed, 42 insertions(+), 1 deletion(-) (limited to 'kernel/sched') diff --git a/kernel/sched/scheduler.c b/kernel/sched/scheduler.c index 1aae1ce..614f621 100644 --- a/kernel/sched/scheduler.c +++ b/kernel/sched/scheduler.c @@ -324,6 +324,48 @@ int fork(void) { return new_task->pid; } +int isset_fdhalt(process_t *p) { + if(NULL == p) { + p = get_current_task(); + } + int blocked = 0; + struct list *read_list = &p->read_list; + struct list *write_list = &p->write_list; + struct list *disconnect_list = &p->disconnect_list; + + for (int i = 0;; i++) { + vfs_inode_t *inode; + if (!list_get(read_list, i, (void **)&inode)) { + break; + } + if (inode->has_data) { + return 0; + } + blocked = 1; + } + for (int i = 0;; i++) { + vfs_inode_t *inode; + if (!list_get(write_list, i, (void **)&inode)) { + break; + } + if (inode->can_write) { + return 0; + } + blocked = 1; + } + for (int i = 0;; i++) { + vfs_inode_t *inode; + if (!list_get(disconnect_list, i, (void **)&inode)) { + break; + } + if (inode->is_open) { + return 0; + } + blocked = 1; + } + return blocked; +} + int is_halted(process_t *process) { for (int i = 0; i < 2; i++) { if (process->halts[i]) { diff --git a/kernel/sched/scheduler.h b/kernel/sched/scheduler.h index 596bedb..ff38034 100644 --- a/kernel/sched/scheduler.h +++ b/kernel/sched/scheduler.h @@ -3,7 +3,6 @@ typedef struct Process process_t; #define SCHEDULER_H #include #include -#include #include #include #include -- cgit v1.2.3