fixed the coding style in idle.c
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2503 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
parent
7e159dfb76
commit
9f348578e7
176
src/idle.c
176
src/idle.c
|
@ -18,9 +18,9 @@
|
||||||
|
|
||||||
#ifndef IDLE_THREAD_STACK_SIZE
|
#ifndef IDLE_THREAD_STACK_SIZE
|
||||||
#if defined (RT_USING_HOOK) || defined(RT_USING_HEAP)
|
#if defined (RT_USING_HOOK) || defined(RT_USING_HEAP)
|
||||||
#define IDLE_THREAD_STACK_SIZE 256
|
#define IDLE_THREAD_STACK_SIZE 256
|
||||||
#else
|
#else
|
||||||
#define IDLE_THREAD_STACK_SIZE 128
|
#define IDLE_THREAD_STACK_SIZE 128
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ static void (*rt_thread_idle_hook)();
|
||||||
*/
|
*/
|
||||||
void rt_thread_idle_sethook(void (*hook)())
|
void rt_thread_idle_sethook(void (*hook)())
|
||||||
{
|
{
|
||||||
rt_thread_idle_hook = hook;
|
rt_thread_idle_hook = hook;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*@}*/
|
/*@}*/
|
||||||
|
@ -61,105 +61,108 @@ void rt_thread_idle_sethook(void (*hook)())
|
||||||
*/
|
*/
|
||||||
void rt_thread_idle_excute(void)
|
void rt_thread_idle_excute(void)
|
||||||
{
|
{
|
||||||
/* check the defunct thread list */
|
/* check the defunct thread list */
|
||||||
if (!rt_list_isempty(&rt_thread_defunct))
|
if (!rt_list_isempty(&rt_thread_defunct))
|
||||||
{
|
{
|
||||||
rt_base_t lock;
|
rt_base_t lock;
|
||||||
rt_thread_t thread;
|
rt_thread_t thread;
|
||||||
#ifdef RT_USING_MODULE
|
#ifdef RT_USING_MODULE
|
||||||
rt_module_t module = RT_NULL;
|
rt_module_t module = RT_NULL;
|
||||||
#endif
|
#endif
|
||||||
RT_DEBUG_NOT_IN_INTERRUPT;
|
RT_DEBUG_NOT_IN_INTERRUPT;
|
||||||
|
|
||||||
/* disable interrupt */
|
/* disable interrupt */
|
||||||
lock = rt_hw_interrupt_disable();
|
lock = rt_hw_interrupt_disable();
|
||||||
|
|
||||||
/* re-check whether list is empty */
|
/* re-check whether list is empty */
|
||||||
if (!rt_list_isempty(&rt_thread_defunct))
|
if (!rt_list_isempty(&rt_thread_defunct))
|
||||||
{
|
{
|
||||||
/* get defunct thread */
|
/* get defunct thread */
|
||||||
thread = rt_list_entry(rt_thread_defunct.next, struct rt_thread, tlist);
|
thread = rt_list_entry(rt_thread_defunct.next,
|
||||||
|
struct rt_thread,
|
||||||
|
tlist);
|
||||||
#ifdef RT_USING_MODULE
|
#ifdef RT_USING_MODULE
|
||||||
/* get thread's parent module */
|
/* get thread's parent module */
|
||||||
module = (rt_module_t)thread->module_id;
|
module = (rt_module_t)thread->module_id;
|
||||||
|
|
||||||
/* if the thread is module's main thread */
|
/* if the thread is module's main thread */
|
||||||
if (module != RT_NULL && module->module_thread == thread)
|
if (module != RT_NULL && module->module_thread == thread)
|
||||||
{
|
{
|
||||||
/* detach module's main thread */
|
/* detach module's main thread */
|
||||||
module->module_thread = RT_NULL;
|
module->module_thread = RT_NULL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/* remove defunct thread */
|
/* remove defunct thread */
|
||||||
rt_list_remove(&(thread->tlist));
|
rt_list_remove(&(thread->tlist));
|
||||||
/* invoke thread cleanup */
|
/* invoke thread cleanup */
|
||||||
if (thread->cleanup != RT_NULL)
|
if (thread->cleanup != RT_NULL)
|
||||||
thread->cleanup(thread);
|
thread->cleanup(thread);
|
||||||
|
|
||||||
/* if it's a system object, not delete it */
|
/* if it's a system object, not delete it */
|
||||||
if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
|
if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
|
||||||
{
|
{
|
||||||
/* enable interrupt */
|
/* enable interrupt */
|
||||||
rt_hw_interrupt_enable(lock);
|
rt_hw_interrupt_enable(lock);
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* enable interrupt */
|
|
||||||
rt_hw_interrupt_enable(lock);
|
|
||||||
|
|
||||||
/* may the defunct thread list is removed by others, just return */
|
return;
|
||||||
return;
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* enable interrupt */
|
||||||
|
rt_hw_interrupt_enable(lock);
|
||||||
|
|
||||||
/* enable interrupt */
|
/* may the defunct thread list is removed by others, just return */
|
||||||
rt_hw_interrupt_enable(lock);
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* enable interrupt */
|
||||||
|
rt_hw_interrupt_enable(lock);
|
||||||
|
|
||||||
#ifdef RT_USING_HEAP
|
#ifdef RT_USING_HEAP
|
||||||
#if defined(RT_USING_MODULE) && defined(RT_USING_SLAB)
|
#if defined(RT_USING_MODULE) && defined(RT_USING_SLAB)
|
||||||
/* the thread belongs to an application module */
|
/* the thread belongs to an application module */
|
||||||
if (thread->flags & RT_OBJECT_FLAG_MODULE)
|
if (thread->flags & RT_OBJECT_FLAG_MODULE)
|
||||||
rt_module_free((rt_module_t)thread->module_id, thread->stack_addr);
|
rt_module_free((rt_module_t)thread->module_id, thread->stack_addr);
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
/* release thread's stack */
|
/* release thread's stack */
|
||||||
rt_free(thread->stack_addr);
|
rt_free(thread->stack_addr);
|
||||||
/* delete thread object */
|
/* delete thread object */
|
||||||
rt_object_delete((rt_object_t)thread);
|
rt_object_delete((rt_object_t)thread);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RT_USING_MODULE
|
#ifdef RT_USING_MODULE
|
||||||
if (module != RT_NULL)
|
if (module != RT_NULL)
|
||||||
{
|
{
|
||||||
extern rt_err_t rt_module_destroy(rt_module_t module);
|
extern rt_err_t rt_module_destroy(rt_module_t module);
|
||||||
|
|
||||||
/* if sub thread list and main thread are all empty */
|
/* if sub thread list and main thread are all empty */
|
||||||
if ((module->module_thread == RT_NULL) &&
|
if ((module->module_thread == RT_NULL) &&
|
||||||
rt_list_isempty(&module->module_object[RT_Object_Class_Thread].object_list) )
|
rt_list_isempty(&module->module_object[RT_Object_Class_Thread].object_list))
|
||||||
{
|
{
|
||||||
module->nref --;
|
module->nref --;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* destroy module */
|
/* destroy module */
|
||||||
if (module->nref == 0)
|
if (module->nref == 0)
|
||||||
rt_module_destroy(module);
|
rt_module_destroy(module);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rt_thread_idle_entry(void *parameter)
|
static void rt_thread_idle_entry(void *parameter)
|
||||||
{
|
{
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
#ifdef RT_USING_HOOK
|
#ifdef RT_USING_HOOK
|
||||||
if (rt_thread_idle_hook != RT_NULL)
|
if (rt_thread_idle_hook != RT_NULL)
|
||||||
rt_thread_idle_hook();
|
rt_thread_idle_hook();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
rt_thread_idle_excute();
|
rt_thread_idle_excute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -171,13 +174,16 @@ static void rt_thread_idle_entry(void *parameter)
|
||||||
*/
|
*/
|
||||||
void rt_thread_idle_init(void)
|
void rt_thread_idle_init(void)
|
||||||
{
|
{
|
||||||
/* initialize thread */
|
/* initialize thread */
|
||||||
rt_thread_init(&idle,
|
rt_thread_init(&idle,
|
||||||
"tidle",
|
"tidle",
|
||||||
rt_thread_idle_entry, RT_NULL,
|
rt_thread_idle_entry,
|
||||||
&rt_thread_stack[0], sizeof(rt_thread_stack),
|
RT_NULL,
|
||||||
RT_THREAD_PRIORITY_MAX - 1, 32);
|
&rt_thread_stack[0],
|
||||||
|
sizeof(rt_thread_stack),
|
||||||
|
RT_THREAD_PRIORITY_MAX - 1,
|
||||||
|
32);
|
||||||
|
|
||||||
/* startup */
|
/* startup */
|
||||||
rt_thread_startup(&idle);
|
rt_thread_startup(&idle);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue