Skip to content

R
rt-thread

BaiXuePrincess / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 1
Star 0
Fork 0
R
rt-thread
提交 38c43262 编写于 作者: qiuyiuestc's avatar qiuyiuestc
浏览文件
操作

module developing 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@663 bbd45198-f89e-11dd-88c7-29a3b14d5316
上级 146d88b0
隐藏空白更改
内联 并排
Showing with 147 addition and 59 deletion
bsp/mini2440/run_module.c
浏览文件 @ 38c43262
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <rtthread.h> #include <rtthread.h>
#include <dfs_posix.h> #include <dfs_posix.h>
#include "string.h"
#ifdef RT_USING_FINSH #ifdef RT_USING_FINSH
#include <finsh.h> #include <finsh.h>
...@@ -22,18 +23,21 @@ static char buffer[4096]; ...@@ -22,18 +23,21 @@ static char buffer[4096];
void run_module(const char* filename) void run_module(const char* filename)
{ {
int fd, length; int fd, length;
struct dfs_stat s; char *module_name;
rt_memset(buffer, 0, 4096);
fd = open(filename, O_RDONLY, 0); fd = open(filename, O_RDONLY, 0);
length = read(fd, buffer, 4096); length = read(fd, buffer, 4096);
if (length == 0) if (length <= 0)
{ {
rt_kprintf("check: read file failed\n"); rt_kprintf("check: read file failed\n");
close(fd); close(fd);
return; return;
} }
rt_kprintf("read %d bytes from file\n", length);
rt_module_load(buffer, filename); module_name = strrchr(filename, '/');
rt_module_load(buffer, ++module_name);
close(fd);
} }
FINSH_FUNCTION_EXPORT(run_module, run module from file); FINSH_FUNCTION_EXPORT(run_module, run module from file);
......
components/finsh/cmd.c
浏览文件 @ 38c43262
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* 2008-09-10 Bernard update the list function for finsh syscall * 2008-09-10 Bernard update the list function for finsh syscall
* list and sysvar list * list and sysvar list
* 2009-05-30 Bernard add list_device * 2009-05-30 Bernard add list_device
* 2010-04-21 yi.qiu add list_module
*/ */
#include <rtthread.h> #include <rtthread.h>
...@@ -69,14 +70,12 @@ FINSH_FUNCTION_EXPORT(version, show RT-Thread version information); ...@@ -69,14 +70,12 @@ FINSH_FUNCTION_EXPORT(version, show RT-Thread version information);
((type *)((char *)(node) - (unsigned long)(&((type *)0)->member))) ((type *)((char *)(node) - (unsigned long)(&((type *)0)->member)))
extern struct rt_object_information rt_object_container[]; extern struct rt_object_information rt_object_container[];
long list_thread(void) static long _list_thread(struct rt_list_node* list)
{ {
struct rt_thread *thread; struct rt_thread *thread;
struct rt_list_node *list, *node; struct rt_list_node *node;
rt_uint8_t* ptr; rt_uint8_t* ptr;
list = &rt_object_container[RT_Object_Class_Thread].object_list;
rt_kprintf(" thread pri status sp stack size max used left tick error\n"); rt_kprintf(" thread pri status sp stack size max used left tick error\n");
rt_kprintf("-------- ---- ------- ---------- ---------- ---------- ---------- ---\n"); rt_kprintf("-------- ---- ------- ---------- ---------- ---------- ---------- ---\n");
for (node = list->next; node != list; node = node->next) for (node = list->next; node != list; node = node->next)
...@@ -101,6 +100,11 @@ long list_thread(void) ...@@ -101,6 +100,11 @@ long list_thread(void)
} }
return 0; return 0;
} }
long list_thread(void)
{
return _list_thread(&rt_object_container[RT_Object_Class_Thread].object_list);
}
FINSH_FUNCTION_EXPORT(list_thread, list thread); FINSH_FUNCTION_EXPORT(list_thread, list thread);
static void show_wait_queue(struct rt_list_node* list) static void show_wait_queue(struct rt_list_node* list)
...@@ -117,12 +121,10 @@ static void show_wait_queue(struct rt_list_node* list) ...@@ -117,12 +121,10 @@ static void show_wait_queue(struct rt_list_node* list)
} }
#ifdef RT_USING_SEMAPHORE #ifdef RT_USING_SEMAPHORE
long list_sem(void) static long _list_sem(struct rt_list_node *list)
{ {
struct rt_semaphore *sem; struct rt_semaphore *sem;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_Semaphore].object_list;
rt_kprintf("semaphore v suspend thread\n"); rt_kprintf("semaphore v suspend thread\n");
rt_kprintf("-------- --- --------------\n"); rt_kprintf("-------- --- --------------\n");
...@@ -143,16 +145,19 @@ long list_sem(void) ...@@ -143,16 +145,19 @@ long list_sem(void)
return 0; return 0;
} }
long list_sem(void)
{
return _list_sem(&rt_object_container[RT_Object_Class_Semaphore].object_list);
}
FINSH_FUNCTION_EXPORT(list_sem, list semaphone in system) FINSH_FUNCTION_EXPORT(list_sem, list semaphone in system)
#endif #endif
#ifdef RT_USING_EVENT #ifdef RT_USING_EVENT
long list_event(void) static long _list_event(struct rt_list_node *list)
{ {
struct rt_event *e; struct rt_event *e;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_Event].object_list;
rt_kprintf("event set suspend thread\n"); rt_kprintf("event set suspend thread\n");
rt_kprintf("-------- ---------- --------------\n"); rt_kprintf("-------- ---------- --------------\n");
...@@ -164,16 +169,19 @@ long list_event(void) ...@@ -164,16 +169,19 @@ long list_event(void)
return 0; return 0;
} }
long list_event(void)
{
return _list_event(&rt_object_container[RT_Object_Class_Event].object_list);
}
FINSH_FUNCTION_EXPORT(list_event, list event in system) FINSH_FUNCTION_EXPORT(list_event, list event in system)
#endif #endif
#ifdef RT_USING_MUTEX #ifdef RT_USING_MUTEX
long list_mutex(void) static long _list_mutex(struct rt_list_node *list)
{ {
struct rt_mutex *m; struct rt_mutex *m;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_Mutex].object_list;
rt_kprintf("mutex owner hold suspend thread\n"); rt_kprintf("mutex owner hold suspend thread\n");
rt_kprintf("-------- -------- ---- --------------\n"); rt_kprintf("-------- -------- ---- --------------\n");
...@@ -185,16 +193,19 @@ long list_mutex(void) ...@@ -185,16 +193,19 @@ long list_mutex(void)
return 0; return 0;
} }
long list_mutex(void)
{
return _list_mutex(&rt_object_container[RT_Object_Class_Mutex].object_list);
}
FINSH_FUNCTION_EXPORT(list_mutex, list mutex in system) FINSH_FUNCTION_EXPORT(list_mutex, list mutex in system)
#endif #endif
#ifdef RT_USING_MAILBOX #ifdef RT_USING_MAILBOX
long list_mailbox(void) static long _list_mailbox(struct rt_list_node *list)
{ {
struct rt_mailbox *m; struct rt_mailbox *m;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_MailBox].object_list;
rt_kprintf("mailbox entry size suspend thread\n"); rt_kprintf("mailbox entry size suspend thread\n");
rt_kprintf("-------- ---- ---- --------------\n"); rt_kprintf("-------- ---- ---- --------------\n");
...@@ -215,16 +226,19 @@ long list_mailbox(void) ...@@ -215,16 +226,19 @@ long list_mailbox(void)
return 0; return 0;
} }
long list_mailbox(void)
{
return _list_mailbox(&rt_object_container[RT_Object_Class_MailBox].object_list);
}
FINSH_FUNCTION_EXPORT(list_mailbox, list mail box in system) FINSH_FUNCTION_EXPORT(list_mailbox, list mail box in system)
#endif #endif
#ifdef RT_USING_MESSAGEQUEUE #ifdef RT_USING_MESSAGEQUEUE
long list_msgqueue(void) static long _list_msgqueue(struct rt_list_node *list)
{ {
struct rt_messagequeue *m; struct rt_messagequeue *m;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_MessageQueue].object_list;
rt_kprintf("msgqueue entry suspend thread\n"); rt_kprintf("msgqueue entry suspend thread\n");
rt_kprintf("-------- ---- --------------\n"); rt_kprintf("-------- ---- --------------\n");
...@@ -245,16 +259,19 @@ long list_msgqueue(void) ...@@ -245,16 +259,19 @@ long list_msgqueue(void)
return 0; return 0;
} }
long list_msgqueue(void)
{
return _list_msgqueue(&rt_object_container[RT_Object_Class_MessageQueue].object_list);
}
FINSH_FUNCTION_EXPORT(list_msgqueue, list message queue in system) FINSH_FUNCTION_EXPORT(list_msgqueue, list message queue in system)
#endif #endif
#ifdef RT_USING_MEMPOOL #ifdef RT_USING_MEMPOOL
long list_mempool(void) static long _list_mempool(struct rt_list_node *list)
{ {
struct rt_mempool *mp; struct rt_mempool *mp;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_MemPool].object_list;
rt_kprintf("mempool block total free suspend thread\n"); rt_kprintf("mempool block total free suspend thread\n");
rt_kprintf("-------- ---- ---- ---- --------------\n"); rt_kprintf("-------- ---- ---- ---- --------------\n");
...@@ -279,15 +296,18 @@ long list_mempool(void) ...@@ -279,15 +296,18 @@ long list_mempool(void)
return 0; return 0;
} }
long list_mempool(void)
{
return _list_mempool(&rt_object_container[RT_Object_Class_MemPool].object_list);
}
FINSH_FUNCTION_EXPORT(list_mempool, list memory pool in system) FINSH_FUNCTION_EXPORT(list_mempool, list memory pool in system)
#endif #endif
long list_timer(void) static long _list_timer(struct rt_list_node *list)
{ {
struct rt_timer *timer; struct rt_timer *timer;
struct rt_list_node *list, *node; struct rt_list_node *node;
list = &rt_object_container[RT_Object_Class_Timer].object_list;
rt_kprintf("timer periodic timeout flag\n"); rt_kprintf("timer periodic timeout flag\n");
rt_kprintf("-------- ---------- ---------- -----------\n"); rt_kprintf("-------- ---------- ---------- -----------\n");
...@@ -303,13 +323,18 @@ long list_timer(void) ...@@ -303,13 +323,18 @@ long list_timer(void)
return 0; return 0;
} }
long list_timer(void)
{
return _list_timer(&rt_object_container[RT_Object_Class_Timer].object_list);
}
FINSH_FUNCTION_EXPORT(list_timer, list timer in system) FINSH_FUNCTION_EXPORT(list_timer, list timer in system)
#ifdef RT_USING_DEVICE #ifdef RT_USING_DEVICE
long list_device(void) static long _list_device(struct rt_list_node *list)
{ {
struct rt_device *device; struct rt_device *device;
struct rt_list_node *list, *node; struct rt_list_node *node;
const char *device_type_str[] = const char *device_type_str[] =
{ {
"Character Device", "Character Device",
...@@ -321,8 +346,6 @@ long list_device(void) ...@@ -321,8 +346,6 @@ long list_device(void)
"Unknown" "Unknown"
}; };
list = &rt_object_container[RT_Object_Class_Device].object_list;
rt_kprintf("device type \n"); rt_kprintf("device type \n");
rt_kprintf("-------- ---------- \n"); rt_kprintf("-------- ---------- \n");
for (node = list->next; node != list; node = node->next) for (node = list->next; node != list; node = node->next)
...@@ -333,6 +356,11 @@ long list_device(void) ...@@ -333,6 +356,11 @@ long list_device(void)
return 0; return 0;
} }
long list_device(void)
{
return _list_device(&rt_object_container[RT_Object_Class_Device].object_list);
}
FINSH_FUNCTION_EXPORT(list_device, list device in system) FINSH_FUNCTION_EXPORT(list_device, list device in system)
#endif #endif
...@@ -344,26 +372,22 @@ int list_module(void) ...@@ -344,26 +372,22 @@ int list_module(void)
list = &rt_object_container[RT_Object_Class_Module].object_list; list = &rt_object_container[RT_Object_Class_Module].object_list;
rt_kprintf("module entry stack size\n");
rt_kprintf("-------- ---------- ----------\n");
for (node = list->next; node != list; node = node->next) for (node = list->next; node != list; node = node->next)
{ {
struct rt_thread *thread; struct rt_list_node *tlist;
struct rt_list_node *tlist, *tnode; struct rt_thread *thread;
rt_uint8_t* ptr; rt_uint8_t* ptr;
module = (struct rt_module*)(rt_list_entry(node, struct rt_object, list)); module = (struct rt_module*)(rt_list_entry(node, struct rt_object, list));
rt_kprintf("%-8s 0x%08x 0x%08x \n", module->parent.name, (rt_uint32_t)module->module_entry, rt_kprintf("______________________________________________________________________\n");
module->stack_size); rt_kprintf("[module]%-8s \n", module->parent.name);
tlist = &module->module_object[RT_Object_Class_Thread].object_list; /* list main thread in module */
if(module->module_thread != RT_NULL)
rt_kprintf(" sub-thread pri status sp stack size max used left tick error\n"); {
rt_kprintf("-------- ---- ------- ---------- ---------- ---------- ---------- ---\n"); rt_kprintf(" main thread pri status sp stack size max used left tick error\n");
rt_kprintf("------------- ---- ------- ---------- ---------- ---------- ---------- ---\n");
for (tnode = tlist->next; tnode != tlist; tnode = tnode->next) thread = module->module_thread;
{
thread = rt_list_entry(tnode, struct rt_thread, list);
rt_kprintf("%-8s 0x%02x", thread->name, thread->current_priority); rt_kprintf("%-8s 0x%02x", thread->name, thread->current_priority);
if (thread->stat == RT_THREAD_READY) rt_kprintf(" ready "); if (thread->stat == RT_THREAD_READY) rt_kprintf(" ready ");
...@@ -379,8 +403,51 @@ int list_module(void) ...@@ -379,8 +403,51 @@ int list_module(void)
thread->stack_size - ((rt_uint32_t) ptr - (rt_uint32_t)thread->stack_addr), thread->stack_size - ((rt_uint32_t) ptr - (rt_uint32_t)thread->stack_addr),
thread->remaining_tick, thread->remaining_tick,
thread->error); thread->error);
} }
/* list sub thread in module */
tlist = &module->module_object[RT_Object_Class_Thread].object_list;
if(!rt_list_isempty(tlist)) _list_thread(tlist);
#ifdef RT_USING_SEMAPHORE
/* list semaphored in module */
tlist = &module->module_object[RT_Object_Class_Semaphore].object_list;
if(!rt_list_isempty(tlist)) _list_sem(tlist);
#endif
#ifdef RT_USING_MUTEX
/* list mutex in module */
tlist = &module->module_object[RT_Object_Class_Mutex].object_list;
if(!rt_list_isempty(tlist)) _list_mutex(tlist);
#endif
#ifdef RT_USING_EVENT
/* list event in module */
tlist = &module->module_object[RT_Object_Class_Event].object_list;
if(!rt_list_isempty(tlist)) _list_event(tlist);
#endif
#ifdef RT_USING_MAILBOX
/* list mailbox in module */
tlist = &module->module_object[RT_Object_Class_MailBox].object_list;
if(!rt_list_isempty(tlist)) _list_mailbox(tlist);
#endif
#ifdef RT_USING_MESSAGEQUEUE
/* list message queue in module */
tlist = &module->module_object[RT_Object_Class_MessageQueue].object_list;
if(!rt_list_isempty(tlist)) _list_msgqueue(tlist);
#endif
#ifdef RT_USING_MEMPOOL
/* list memory pool in module */
tlist = &module->module_object[RT_Object_Class_MemPool].object_list;
if(!rt_list_isempty(tlist)) _list_mempool(tlist);
#endif
#ifdef RT_USING_DEVICE
/* list device in module */
tlist = &module->module_object[RT_Object_Class_Device].object_list;
if(!rt_list_isempty(tlist)) _list_device(tlist);
#endif
/* list timer in module */
tlist = &module->module_object[RT_Object_Class_Timer].object_list;
if(!rt_list_isempty(tlist)) _list_timer(tlist);
} }
rt_kprintf("______________________________________________________________________\n");
return 0; return 0;
} }
......
src/idle.c
浏览文件 @ 38c43262
...@@ -79,6 +79,11 @@ static void rt_thread_idle_entry(void* parameter) ...@@ -79,6 +79,11 @@ static void rt_thread_idle_entry(void* parameter)
/* release thread's stack */ /* release thread's stack */
rt_free(thread->stack_addr); rt_free(thread->stack_addr);
#ifdef RT_USING_MODULE
/* release thread point in module */
if(thread->module_parent != RT_NULL)
thread->module_parent->module_thread = RT_NULL;
#endif
/* delete thread object */ /* delete thread object */
rt_object_delete((rt_object_t)thread); rt_object_delete((rt_object_t)thread);
} }
......
src/module.c
浏览文件 @ 38c43262
...@@ -255,9 +255,15 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name) ...@@ -255,9 +255,15 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name)
if (IS_PROG(shdr[index]) && IS_AW(shdr[index])) if (IS_PROG(shdr[index]) && IS_AW(shdr[index]))
{ {
module->module_data = (rt_uint32_t)ptr; module->module_data = (rt_uint32_t)ptr;
rt_memset(ptr, 0, shdr[index].sh_size); rt_memcpy(ptr, (rt_uint8_t*)elf_module + shdr[index].sh_offset, shdr[index].sh_size);
ptr += shdr[index].sh_size; ptr += shdr[index].sh_size;
} }
/* load bss section */
if (IS_NOPROG(shdr[index]) && IS_AW(shdr[index]))
{
rt_memset(ptr, 0, shdr[index].sh_size);
}
} }
/* set module entry */ /* set module entry */
...@@ -316,7 +322,7 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name) ...@@ -316,7 +322,7 @@ struct rt_module* rt_module_load(void* module_ptr, const rt_uint8_t* name)
{ {
/* relocate object in data section */ /* relocate object in data section */
rt_module_arm_relocate(module, rel, rt_module_arm_relocate(module, rel,
(Elf32_Addr)(ptr + sym->st_value), (Elf32_Addr)(module->module_data + sym->st_value),
module_addr); module_addr);
} }
} }
......
src/object.c
浏览文件 @ 38c43262
...@@ -180,8 +180,14 @@ void rt_object_init(struct rt_object* object, enum rt_object_class_type type, co ...@@ -180,8 +180,14 @@ void rt_object_init(struct rt_object* object, enum rt_object_class_type type, co
register rt_base_t temp; register rt_base_t temp;
struct rt_object_information* information; struct rt_object_information* information;
#ifdef RT_USING_MODULE
/* get module object information */
information = (rt_current_module != RT_NULL) ?
&rt_current_module->module_object[type] : &rt_object_container[type];
#else
/* get object information */ /* get object information */
information = &rt_object_container[type]; information = &rt_object_container[type];
#endif
/* init object's parameters */ /* init object's parameters */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或