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

支持pid，由init管理

Browse Source
This commit is contained in:
zhangzheng
2023-11-29 23:25:32 +08:00
parent 2905bf4930
commit c0d24e4a49
16 changed files with 178 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mkrtos_knl/inc/knl/task.h
View File

@@ -16,8 +16,13 @@ typedef struct task
mm_space_t mm_space;
ram_limit_t *lim;
ref_counter_t ref_cn;
pid_t pid;
} task_t;
static inline pid_t task_pid_get(task_t *task)
{
return task->pid;
}
void task_init(task_t *task, ram_limit_t *ram, int is_knl);
task_t *task_create(ram_limit_t *lim, int is_knl);
int task_alloc_base_ram(task_t *tk, ram_limit_t *lim, size_t size);

1
mkrtos_knl/inc/lib/types.h
View File

@@ -28,6 +28,7 @@ typedef umword_t uintptr_t;
typedef umword_t addr_t;
typedef umword_t obj_handler_t;
typedef umword_t time_t;
typedef umword_t pid_t;
#ifndef NULL
#define NULL ((void *)0)
#endif

22
mkrtos_knl/knl/task.c
View File

@@ -24,6 +24,8 @@ enum task_op_code
TASK_OBJ_UNMAP,
TASK_ALLOC_RAM_BASE,
TASK_OBJ_VALID,
TASK_SET_PID,
TASK_GET_PID,
};
static bool_t task_put(kobject_t *kobj);
static void task_release_stage1(kobject_t *kobj);
@@ -182,6 +184,25 @@ static void task_syscall_func(kobject_t *kobj, syscall_prot_t sys_p, msg_tag_t i
spinlock_set(&tag_task->kobj.lock, status);
}
break;
case TASK_SET_PID:
{
if (tag_task->pid == (pid_t)(-1))
{
tag_task->pid = f->r[0];
tag = msg_tag_init4(0, 0, 0, 0);
}
else
{
tag = msg_tag_init4(0, 0, 0, -EACCES);
}
}
break;
case TASK_GET_PID:
{
f->r[1] = tag_task->pid;
tag = msg_tag_init4(0, 0, 0, 0);
}
break;
default:
break;
}
@@ -199,6 +220,7 @@ void task_init(task_t *task, ram_limit_t *ram, int is_knl)
mm_space_init(&task->mm_space, is_knl);
ref_counter_init(&task->ref_cn);
ref_counter_inc(&task->ref_cn);
task->pid = (pid_t)(-1);
task->lim = ram;
task->kobj.invoke_func = task_syscall_func;
task->kobj.put_func = task_put;

6
mkrtos_knl/knl/thread.c
View File

@@ -377,6 +377,8 @@ static int ipc_data_copy(thread_t *dst_th, thread_t *src_th, msg_tag_t tag)
void *dst = dst_th->msg.msg;
ipc_msg_t *src_ipc;
ipc_msg_t *dst_ipc;
task_t *src_tk = thread_get_bind_task(src_th);
task_t *dst_tk = thread_get_bind_task(dst_th);
src_ipc = src;
dst_ipc = dst;
@@ -387,8 +389,7 @@ static int ipc_data_copy(thread_t *dst_th, thread_t *src_th, msg_tag_t tag)
int map_len = tag.map_buf_len;
kobj_del_list_init(&del);
task_t *src_tk = thread_get_bind_task(src_th);
task_t *dst_tk = thread_get_bind_task(dst_th);
for (int i = 0; i < map_len; i++)
{
int ret = 0;
@@ -412,6 +413,7 @@ static int ipc_data_copy(thread_t *dst_th, thread_t *src_th, msg_tag_t tag)
}
kobj_del_list_to_do(&del);
}
dst_ipc->user[2] = task_pid_get(src_tk);
memcpy(dst_ipc->msg_buf, src_ipc->msg_buf, MIN(tag.msg_buf_len * WORD_BYTES, IPC_MSG_SIZE));
dst_th->msg.tag = tag;
return 0;

13
mkrtos_user/lib/libc_backend/Kconfig
View File

@@ -1,8 +1,13 @@
menu "Libc backend"
config MKRTOS_LIBC_FD_MAP_NR
int "fd map layer size"
default 32
config FD_MAP_ROW_CN
int "fd map row cn"
default 16
help
Set the number of mapping layers, the larger the number of FD available to the user.
endmenu
config FD_MAP_ROW_NR
int "fd map row nr"
default 16
help
Set the number of mapping layers, the larger the number of FD available to the user.
endmenu

3
mkrtos_user/lib/sys/inc/u_task.h
View File

@@ -7,7 +7,8 @@ enum obj_attrs
KOBJ_DELETE_RIGHT = 1,
KOBJ_ALL_RIGHTS = 3,
};
msg_tag_t task_set_pid(obj_handler_t dst_task, umword_t pid);
msg_tag_t task_get_pid(obj_handler_t dst_task, umword_t *data, int inx);
msg_tag_t task_obj_valid(obj_handler_t dst_task, obj_handler_t obj_inx);
msg_tag_t task_map(obj_handler_t dst_task, obj_handler_t src_obj, obj_handler_t dst_obj, uint8_t attrs);
msg_tag_t task_unmap(obj_handler_t task_han, vpage_t vpage);

94
mkrtos_user/lib/sys/src/u_task.c
View File

@@ -7,19 +7,63 @@ enum task_op_code
TASK_OBJ_MAP,
TASK_OBJ_UNMAP,
TASK_ALLOC_RAM_BASE,
TASK_OBJ_VALID,
TASK_SET_PID,
TASK_GET_PID,
};
msg_tag_t task_set_pid(obj_handler_t dst_task, umword_t pid)
{
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(TASK_SET_PID, TASK_PROT, dst_task).raw,
pid,
0,
0,
0,
0,
0);
asm __volatile__(""
:
:
: "r0");
msg_tag_t tag = msg_tag_init(r0);
return tag;
}
msg_tag_t task_get_pid(obj_handler_t dst_task, umword_t *pid, int inx)
{
register volatile umword_t r0 asm("r0");
register volatile umword_t r1 asm("r1");
mk_syscall(syscall_prot_create(TASK_GET_PID, TASK_PROT, dst_task).raw,
inx,
0,
0,
0,
0,
0);
asm __volatile__(""
:
:
: "r0", "r1");
if (pid)
{
*pid = r1;
}
return msg_tag_init(r0);
}
msg_tag_t task_obj_valid(obj_handler_t dst_task, obj_handler_t obj_inx)
{
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(TASK_OBJ_MAP, TASK_PROT, dst_task).raw,
0,
obj_inx,
0,
0,
0,
0);
mk_syscall(syscall_prot_create(TASK_OBJ_VALID, TASK_PROT, dst_task).raw,
0,
obj_inx,
0,
0,
0,
0);
asm __volatile__(""
:
:
@@ -34,12 +78,12 @@ msg_tag_t task_map(obj_handler_t dst_task, obj_handler_t src_obj, obj_handler_t
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(TASK_OBJ_MAP, TASK_PROT, dst_task).raw,
0,
src_obj,
dst_obj,
attrs,
0,
0);
0,
src_obj,
dst_obj,
attrs,
0,
0);
asm __volatile__(""
:
:
@@ -54,12 +98,12 @@ msg_tag_t task_unmap(obj_handler_t task_han, vpage_t vpage)
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(TASK_OBJ_UNMAP, TASK_PROT, task_han).raw,
0,
vpage.raw,
0,
0,
0,
0);
0,
vpage.raw,
0,
0,
0,
0);
msg_tag_t tag = msg_tag_init(r0);
return tag;
@@ -70,12 +114,12 @@ msg_tag_t task_alloc_ram_base(obj_handler_t task_han, umword_t size, addr_t *all
register volatile umword_t r1 asm("r1");
mk_syscall(syscall_prot_create(TASK_ALLOC_RAM_BASE, TASK_PROT, task_han).raw,
0,
size,
0,
0,
0,
0);
0,
size,
0,
0,
0,
0);
asm __volatile__(""
:
:

12
mkrtos_user/lib/sys_util/src/u_app_loader.c
View File

@@ -140,6 +140,11 @@ int app_load(const char *name, uenv_t *cur_env)
{
goto end_del_obj;
}
tag = task_set_pid(hd_task, hd_task); //!< 设置进程的pid就是进程hd号码
if (msg_tag_get_prot(tag) < 0)
{
goto end_del_obj;
}
void *sp_addr = (char *)ram_base + app->i.stack_offset - app->i.data_offset;
void *sp_addr_top = (char *)sp_addr + app->i.stack_size;
@@ -189,10 +194,6 @@ end_del_obj:
{
task_unmap(TASK_THIS, vpage_create_raw3(KOBJ_DELETE_RIGHT, 0, hd_task));
}
// if (hd_ipc != HANDLER_INVALID)
// {
// task_unmap(TASK_THIS, vpage_create_raw3(KOBJ_DELETE_RIGHT, 0, hd_ipc));
// }
end:
if (hd_task != HANDLER_INVALID)
{
@@ -202,8 +203,5 @@ end:
{
handler_free(hd_thread);
}
// if (hd_ipc != HANDLER_INVALID)
// {
// }
return -ENOMEM;
}

4
mkrtos_user/server/hello/CMakeLists.txt
View File

@@ -25,6 +25,7 @@ target_include_directories(
${CMAKE_SOURCE_DIR}/mkrtos_user/lib/sys/inc
${CMAKE_SOURCE_DIR}/mkrtos_user/lib/sys_util/inc
${CMAKE_SOURCE_DIR}/mkrtos_user/lib/sys_svr/inc
${CMAKE_SOURCE_DIR}/mkrtos_user/server/hello/src/test
${CMAKE_SOURCE_DIR}/mkrtos_user/lib/mlibc/arch/arm/
${CMAKE_SOURCE_DIR}/mkrtos_user/lib/mlibc/arch/generic
@@ -66,4 +67,7 @@ add_dependencies(shell_dump hello.elf)
add_dependencies(shell_dump sys)
add_dependencies(shell_dump sys_util)
add_dependencies(shell_dump mr)
add_dependencies(shell_dump sys_svr)
add_dependencies(shell_dump start)
add_dependencies(shell_dump muslc)

31
mkrtos_user/server/hello/src/main.c
View File

@@ -3,34 +3,19 @@
#include "u_log.h"
#include "u_env.h"
#include "u_sleep.h"
#include "pm_cli.h"
#include "drv_cli.h"
#include <unistd.h>
#include <mr_api.h>
#include <assert.h>
void drv_test(void)
{
char data[10] = "mkrtos..\n";
int fd = dev_fs_open("/dev/uart1", MR_OFLAG_RDWR);
assert(fd > 0);
int ret = dev_fs_read(fd, data, sizeof(data));
assert(ret >= 0);
printf("%s:%d data:%s.\n", __func__, __LINE__, data);
ret = dev_fs_write(fd, data, sizeof(data));
assert(ret >= 0);
dev_fs_close(fd);
}
#include <stdio.h>
#include "test.h"
int main(int argc, char *args[])
{
printf("Hello world.\n");
printf("%s start running.\n", args[0]);
usleep(100000);
// while (pm_run_app("hello", 0) < 0)
// usleep(100000);
ulog_write_str(u_get_global_env()->log_hd, "hello is runing...\n");
drv_test();
ulog_write_str(u_get_global_env()->log_hd, "Hello world.\n");
ulog_write_str(u_get_global_env()->log_hd, "test start...\n");
mr_drv_test();
pm_test();
ulog_write_str(u_get_global_env()->log_hd, "test end.\n");
return 0;
}

17
mkrtos_user/server/hello/src/test/mr_drv_test.c Normal file
View File

@@ -0,0 +1,17 @@
#include "drv_cli.h"
#include <mr_api.h>
#include <assert.h>
#include <stdio.h>
void mr_drv_test(void)
{
char data[10] = "mkrtos..\n";
int fd = dev_fs_open("/dev/uart1", MR_OFLAG_RDWR);
assert(fd > 0);
int ret = dev_fs_read(fd, data, sizeof(data));
assert(ret >= 0);
printf("%s:%d data:%s.\n", __func__, __LINE__, data);
ret = dev_fs_write(fd, data, sizeof(data));
assert(ret >= 0);
dev_fs_close(fd);
}

12
mkrtos_user/server/hello/src/test/pm_test.c Normal file
View File

@@ -0,0 +1,12 @@
#include "pm_cli.h"
#include <stdio.h>
void pm_test(void)
{
int ret = pm_run_app("rtthread_drv", 0);
if (ret < 0)
{
printf("rtthread_drv start error.\n");
}
}

4
mkrtos_user/server/hello/src/test/test.h Normal file
View File

@@ -0,0 +1,4 @@
#pragma once
void mr_drv_test(void);
void pm_test(void);

3
mkrtos_user/server/init/src/cons_cli.c Normal file
View File

@@ -0,0 +1,3 @@

11
mkrtos_user/server/init/src/cons_svr.c Normal file
View File

@@ -0,0 +1,11 @@
#include <u_types.h>
#include <u_queue.h>
#include <u_util.h>
#define CONS_WRITE_BUF_SIZE (128 + 1)
static queue_t w_queue;
// AUTO_CALL(101)
// static void console

2
mkrtos_user/server/init/src/main.c
View File

@@ -61,11 +61,13 @@ int main(int argc, char *args[])
ulog_write_str(LOG_PROT, "init..\n");
test();
task_set_pid(TASK_THIS, 0);
env = u_get_global_env();
rpc_meta_init(THREAD_MAIN, &env->ns_hd);
namespace_init();
pm_init();
ret = parse_cfg(DEFAULT_INIT_CFG, env);
printf("run app num is %d.\n", ret);
namespace_pre_alloc_map_fd();