libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: Revert thread.c and rtthread.h to previous version. 

FIX: Abort handler will suspend current thread instead of terminate it.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@260 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
mbbill 2009-12-29 08:13:45 +00:00
parent 8a590215b6
commit 54453a0748
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/rtthread.h
View File

@ -112,7 +112,6 @@ rt_err_t rt_thread_control(rt_thread_t thread, rt_uint8_t cmd, void* arg);
rt_err_t rt_thread_suspend(rt_thread_t thread); rt_err_t rt_thread_suspend(rt_thread_t thread);
rt_err_t rt_thread_resume(rt_thread_t thread); rt_err_t rt_thread_resume(rt_thread_t thread);
void rt_thread_timeout(void* parameter); void rt_thread_timeout(void* parameter);
void rt_thread_exit(void);
/* /*
* idle thread interface * idle thread interface
@ -176,7 +175,7 @@ void rt_free (void *ptr);
void* rt_realloc(void *ptr, rt_size_t nbytes); void* rt_realloc(void *ptr, rt_size_t nbytes);
void *rt_calloc(rt_size_t count, rt_size_t size); void *rt_calloc(rt_size_t count, rt_size_t size);
void rt_memory_info(rt_uint32_t *total, void rt_memory_info(rt_uint32_t *total,
rt_uint32_t *used, rt_uint32_t *used,
rt_uint32_t *max_used); rt_uint32_t *max_used);

12
libcpu/arm/AT91SAM7X/trap.c
View File

@ -36,11 +36,13 @@ void rt_hw_trap_fiq()
{ {
rt_kprintf("fast interrupt request\n"); rt_kprintf("fast interrupt request\n");
} }
extern void rt_thread_exit(void); extern struct rt_thread* rt_current_thread;
void rt_hw_trap_abort() void rt_hw_trap_abort()
{ {
rt_thread_exit(); rt_kprintf("Abort occured!!! Thread [%s] suspended.\n",rt_current_thread->name);
rt_kprintf("Abort occured, thread terminated.\n"); rt_thread_suspend(rt_current_thread);
rt_schedule();
} }
/*@}*/ /*@}*/

3
src/thread.c
View File

@ -34,6 +34,7 @@ extern rt_uint8_t rt_current_priority;
extern rt_list_t rt_thread_defunct; extern rt_list_t rt_thread_defunct;
#endif #endif
static void rt_thread_exit(void);
void rt_thread_timeout(void* parameter); void rt_thread_timeout(void* parameter);
static rt_err_t _rt_thread_init(struct rt_thread* thread, static rt_err_t _rt_thread_init(struct rt_thread* thread,
@ -222,7 +223,7 @@ rt_err_t rt_thread_startup (rt_thread_t thread)
return RT_EOK; return RT_EOK;
} }
void rt_thread_exit() static void rt_thread_exit()
{ {
struct rt_thread* thread; struct rt_thread* thread;
register rt_base_t temp; register rt_base_t temp;