DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-14 12:06:48 +00:00
Code Issues Releases Wiki Activity

将wait_queue中的结点改为kmalloc创建

Browse Source
This commit is contained in:
fslongjin 2022-05-30 18:25:50 +08:00
parent 85707bd8cc
commit b828622ea6
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/driver/interrupt/apic/apic.c
View File

@ -448,14 +448,15 @@ void apic_init()
void do_IRQ(struct pt_regs *rsp, ul number) void do_IRQ(struct pt_regs *rsp, ul number)
{ {
if (number < 0x80) // 以0x80为界限，低于0x80的是外部中断控制器，高于0x80的是Local APIC if (number < 0x80 && number >= 32) // 以0x80为界限，低于0x80的是外部中断控制器，高于0x80的是Local APIC
// 外部中断控制器 // 外部中断控制器
{ {
irq_desc_t *irq = &interrupt_desc[number - 32]; irq_desc_t *irq = &interrupt_desc[number - 32];
// 执行中断上半部处理程序 // 执行中断上半部处理程序
if (irq->handler != NULL) if (irq != NULL && irq->handler != NULL)
irq->handler(number, irq->parameter, rsp); irq->handler(number, irq->parameter, rsp);
else else
kwarn("Intr vector [%d] does not have a handler!"); kwarn("Intr vector [%d] does not have a handler!");

2
kernel/exception/irq.c
View File

@ -207,9 +207,9 @@ void irq_init()
init_8259A(); init_8259A();
#else #else
memset((void *)interrupt_desc, 0, sizeof(irq_desc_t) * IRQ_NUM);
apic_init(); apic_init();
memset((void *)interrupt_desc, 0, sizeof(irq_desc_t) * IRQ_NUM);
#endif #endif
} }

32
kernel/process/wait_queue.c
View File

@ -1,6 +1,7 @@
#include "wait_queue.h" #include "wait_queue.h"
#include <sched/sched.h> #include <sched/sched.h>
#include <process/process.h> #include <process/process.h>
#include <mm/slab.h>
/** /**
* @brief 初始化等待队列 * @brief 初始化等待队列
@ -21,45 +22,46 @@ void wait_queue_init(wait_queue_node_t *wait_queue, struct process_control_block
*/ */
void wait_queue_sleep_on(wait_queue_node_t *wait_queue_head) void wait_queue_sleep_on(wait_queue_node_t *wait_queue_head)
{ {
wait_queue_node_t wait; wait_queue_node_t *wait = (wait_queue_node_t *)kmalloc(sizeof(wait_queue_node_t), 0);
wait_queue_init(&wait, current_pcb); wait_queue_init(wait, current_pcb);
current_pcb->state = PROC_UNINTERRUPTIBLE; current_pcb->state = PROC_UNINTERRUPTIBLE;
list_append(&wait_queue_head->wait_list, &wait.wait_list); list_append(&wait_queue_head->wait_list, &wait->wait_list);
sched_cfs(); sched_cfs();
} }
/** /**
* @brief 在等待队列上进行等待(允许中断) * @brief 在等待队列上进行等待(允许中断)
* *
* @param wait_queue_head 队列头指针 * @param wait_queue_head 队列头指针
*/ */
void wait_queue_sleep_on_interriptible(wait_queue_node_t * wait_queue_head) void wait_queue_sleep_on_interriptible(wait_queue_node_t *wait_queue_head)
{ {
wait_queue_node_t wait; wait_queue_node_t *wait = (wait_queue_node_t *)kmalloc(sizeof(wait_queue_node_t), 0);
wait_queue_init(&wait, current_pcb); wait_queue_init(wait, current_pcb);
current_pcb->state = PROC_INTERRUPTIBLE; current_pcb->state = PROC_INTERRUPTIBLE;
list_append(&wait_queue_head->wait_list, &wait.wait_list); list_append(&wait_queue_head->wait_list, &wait->wait_list);
sched_cfs(); sched_cfs();
} }
/** /**
* @brief 唤醒在等待队列的头部的进程 * @brief 唤醒在等待队列的头部的进程
* *
* @param wait_queue_head * @param wait_queue_head
* @param state * @param state
*/ */
void wait_queue_wakeup(wait_queue_node_t * wait_queue_head, int64_t state) void wait_queue_wakeup(wait_queue_node_t *wait_queue_head, int64_t state)
{ {
if(list_empty(&wait_queue_head->wait_list)) if (list_empty(&wait_queue_head->wait_list))
return; return;
wait_queue_node_t * wait = container_of(list_next(&wait_queue_head->wait_list), wait_queue_node_t, wait_list); wait_queue_node_t *wait = container_of(list_next(&wait_queue_head->wait_list), wait_queue_node_t, wait_list);
// 符合唤醒条件 // 符合唤醒条件
if(wait->pcb->state & state) if (wait->pcb->state & state)
{ {
list_del(&wait->wait_list); list_del(&wait->wait_list);
process_wakeup(wait->pcb); process_wakeup(wait->pcb);
kfree(wait);
} }
} }