|
@@ -1,6 +1,7 @@
|
|
|
#include "wait_queue.h"
|
|
|
#include <sched/sched.h>
|
|
|
#include <process/process.h>
|
|
|
+#include <mm/slab.h>
|
|
|
|
|
|
/**
|
|
|
* @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)
|
|
|
{
|
|
|
- wait_queue_node_t wait;
|
|
|
- wait_queue_init(&wait, current_pcb);
|
|
|
+ wait_queue_node_t *wait = (wait_queue_node_t *)kmalloc(sizeof(wait_queue_node_t), 0);
|
|
|
+ wait_queue_init(wait, current_pcb);
|
|
|
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();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @brief 在等待队列上进行等待(允许中断)
|
|
|
- *
|
|
|
+ *
|
|
|
* @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_init(&wait, current_pcb);
|
|
|
+ wait_queue_node_t *wait = (wait_queue_node_t *)kmalloc(sizeof(wait_queue_node_t), 0);
|
|
|
+ wait_queue_init(wait, current_pcb);
|
|
|
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();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* @brief 唤醒在等待队列的头部的进程
|
|
|
- *
|
|
|
- * @param wait_queue_head
|
|
|
- * @param state
|
|
|
+ *
|
|
|
+ * @param wait_queue_head
|
|
|
+ * @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;
|
|
|
- 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);
|
|
|
process_wakeup(wait->pcb);
|
|
|
+ kfree(wait);
|
|
|
}
|
|
|
}
|