lby/mkrtos-real
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持cpiofs&&init能够监控进程的死亡

Browse Source
This commit is contained in:
zhangzheng
2023-12-09 23:11:55 +08:00
parent 9e7c1e08ee
commit 22c5c91734
44 changed files with 904 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
mkrtos_knl/knl/thread_knl.c
View File

@@ -22,31 +22,79 @@
#include "mm_wrap.h"
#include "thread_armv7m.h"
#include "misc.h"
static uint8_t knl_msg_buf[THREAD_MSG_BUG_LEN];
static thread_t *knl_thread;
static task_t knl_task;
static thread_t *init_thread;
static task_t *init_task;
static slist_head_t del_task_head;
static spinlock_t del_lock;
static void knl_main(void)
{
umword_t status;
umword_t status2;
printk("knl main run..\n");
while (1)
{
task_t *pos;
if (slist_is_empty(&del_task_head))
{
continue;
}
status2 = spinlock_lock(&del_lock);
if (slist_is_empty(&del_task_head))
{
spinlock_set(&del_lock, status2);
continue;
}
slist_foreach_not_next(pos, &del_task_head, del_node)
{
task_t *next = slist_next_entry(pos, &del_task_head, del_node);
slist_del(&pos->del_node);
{
// TODO:给init发送消息，该函数是在中断中调用的，所以这个消息只能在knl_thread中调用。
msg_tag_t tag;
umword_t user_id;
ipc_msg_t *msg = (ipc_msg_t *)knl_msg_buf;
msg->msg_buf[0] = 1; /*KILL_TASK*/
msg->msg_buf[1] = pos->pid;
msg->msg_buf[2] = 0;
int ret = thread_ipc_call(init_thread, msg_tag_init4(0, 3, 0, 0x0005/*PM_PROT*/),
&tag, ipc_timeout_create2(0, 0), &user_id);
if (ret < 0)
{
printk("%s:%d ret:%d\n", __func__, __LINE__, ret);
}
}
task_kill(pos);
pos = next;
}
spinlock_set(&del_lock, status2);
}
}
/**
* 初始化内核线程
* 初始化内核任务
*/
static void knl_init_1(void)
{
thread_t *cur_th = thread_get_current();
knl_thread = thread_get_current();
thread_init(cur_th, &root_factory_get()->limit);
thread_init(knl_thread, &root_factory_get()->limit);
task_init(&knl_task, &root_factory_get()->limit, TRUE);
thread_knl_pf_set(cur_th, knl_main);
thread_bind(cur_th, &knl_task.kobj);
thread_ready(cur_th, FALSE);
thread_knl_pf_set(knl_thread, knl_main);
thread_bind(knl_thread, &knl_task.kobj);
thread_set_msg_bug(knl_thread, knl_msg_buf);
thread_ready(knl_thread, FALSE);
slist_init(&del_task_head);
}
INIT_STAGE1(knl_init_1);
@@ -59,12 +107,13 @@ INIT_STAGE1(knl_init_1);
static void knl_init_2(void)
{
mm_trace();
thread_t *init_thread = thread_create(&root_factory_get()->limit);
init_thread = thread_create(&root_factory_get()->limit);
assert(init_thread);
task_t *init_task = task_create(&root_factory_get()->limit, FALSE);
init_task = task_create(&root_factory_get()->limit, FALSE);
assert(init_task);
app_info_t *app = app_info_get((void *)(KNL_TEXT + INIT_OFFSET));
app_info_t *app = app_info_get((void *)(CONFIG_KNL_TEXT_ADDR + INIT_OFFSET));
// 申请init的ram内存
assert(task_alloc_base_ram(init_task, &root_factory_get()->limit, app->i.ram_size + THREAD_MSG_BUG_LEN) >= 0);
void *sp_addr = (char *)init_task->mm_space.mm_block + app->i.stack_offset - app->i.data_offset;
@@ -72,7 +121,7 @@ static void knl_init_2(void)
thread_set_msg_bug(init_thread, (char *)(init_task->mm_space.mm_block) + app->i.ram_size);
thread_bind(init_thread, &init_task->kobj);
thread_user_pf_set(init_thread, (void *)(KNL_TEXT + INIT_OFFSET), (void *)((umword_t)sp_addr_top - 8),
thread_user_pf_set(init_thread, (void *)(CONFIG_KNL_TEXT_ADDR + INIT_OFFSET), (void *)((umword_t)sp_addr_top - 8),
init_task->mm_space.mm_block, 0);
assert(obj_map_root(&init_thread->kobj, &init_task->obj_space, &root_factory_get()->limit, vpage_create3(KOBJ_ALL_RIGHTS, 0, THREAD_PROT)));
assert(obj_map_root(&init_task->kobj, &init_task->obj_space, &root_factory_get()->limit, vpage_create3(KOBJ_ALL_RIGHTS, 0, TASK_PROT)));
@@ -90,6 +139,26 @@ static void knl_init_2(void)
}
INIT_STAGE2(knl_init_2);
void task_knl_kill(thread_t *kill_thread, bool_t is_knl)
{
printk("kill task:0x%x.\n", kill_thread->task);
task_t *task = container_of(kill_thread->task, task_t, kobj);
if (!is_knl)
{
umword_t status2;
thread_suspend(kill_thread);
status2 = spinlock_lock(&del_lock);
slist_add_append(&del_task_head, &task->del_node);
spinlock_set(&del_lock, status2);
}
else
{
printk("[knl]: knl panic.\n");
assert(0);
}
}
static void print_mkrtos_info(void)
{
const char *start_info[] = {