From f7b14218800ad7ed6c47c67d4d043a3340d63116 Mon Sep 17 00:00:00 2001 From: Grissiom Date: Sat, 21 Dec 2013 12:51:52 +0800 Subject: TC: expand TABs --- examples/kernel/thread_priority.c | 122 +++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'examples/kernel/thread_priority.c') diff --git a/examples/kernel/thread_priority.c b/examples/kernel/thread_priority.c index 1d6fb4a80e..81a9bc0382 100644 --- a/examples/kernel/thread_priority.c +++ b/examples/kernel/thread_priority.c @@ -12,94 +12,94 @@ static rt_uint32_t count = 0; */ static void thread1_entry(void* parameter) { - while (1) - { - count ++; - rt_kprintf("count = %d\n", count); + while (1) + { + count ++; + rt_kprintf("count = %d\n", count); - rt_thread_delay(10); - } + rt_thread_delay(10); + } } static void thread2_entry(void* parameter) { - rt_tick_t tick; - - tick = rt_tick_get(); - while (1) - { - if (rt_tick_get() - tick >= 50) - { - if (count == 0) - tc_done(TC_STAT_FAILED); - else - tc_done(TC_STAT_PASSED); - - break; - } - } + rt_tick_t tick; + + tick = rt_tick_get(); + while (1) + { + if (rt_tick_get() - tick >= 50) + { + if (count == 0) + tc_done(TC_STAT_FAILED); + else + tc_done(TC_STAT_PASSED); + + break; + } + } } int thread_priority_init() { - rt_err_t result; - - result = rt_thread_init(&thread1, - "t1", - thread1_entry, RT_NULL, - &thread1_stack[0], sizeof(thread1_stack), - THREAD_PRIORITY - 1, THREAD_TIMESLICE); - - if (result == RT_EOK) - rt_thread_startup(&thread1); - else - tc_stat(TC_STAT_FAILED); - - rt_thread_init(&thread2, - "t2", - thread2_entry, RT_NULL, - &thread2_stack[0], sizeof(thread2_stack), - THREAD_PRIORITY + 1, THREAD_TIMESLICE); - - if (result == RT_EOK) - rt_thread_startup(&thread2); - else - tc_stat(TC_STAT_FAILED); - - return 0; + rt_err_t result; + + result = rt_thread_init(&thread1, + "t1", + thread1_entry, RT_NULL, + &thread1_stack[0], sizeof(thread1_stack), + THREAD_PRIORITY - 1, THREAD_TIMESLICE); + + if (result == RT_EOK) + rt_thread_startup(&thread1); + else + tc_stat(TC_STAT_FAILED); + + rt_thread_init(&thread2, + "t2", + thread2_entry, RT_NULL, + &thread2_stack[0], sizeof(thread2_stack), + THREAD_PRIORITY + 1, THREAD_TIMESLICE); + + if (result == RT_EOK) + rt_thread_startup(&thread2); + else + tc_stat(TC_STAT_FAILED); + + return 0; } #ifdef RT_USING_TC static void _tc_cleanup() { - /* lock scheduler */ - rt_enter_critical(); + /* lock scheduler */ + rt_enter_critical(); - if (thread1.stat != RT_THREAD_CLOSE) - rt_thread_detach(&thread1); - if (thread2.stat != RT_THREAD_CLOSE) - rt_thread_detach(&thread2); + if (thread1.stat != RT_THREAD_CLOSE) + rt_thread_detach(&thread1); + if (thread2.stat != RT_THREAD_CLOSE) + rt_thread_detach(&thread2); - /* unlock scheduler */ - rt_exit_critical(); + /* unlock scheduler */ + rt_exit_critical(); } int _tc_thread_priority() { - count = 0; + count = 0; - /* set tc cleanup */ - tc_cleanup(_tc_cleanup); - thread_priority_init(); + /* set tc cleanup */ + tc_cleanup(_tc_cleanup); + thread_priority_init(); - return RT_TICK_PER_SECOND; + return RT_TICK_PER_SECOND; } FINSH_FUNCTION_EXPORT(_tc_thread_priority, a priority thread test); #else int rt_application_init() { - thread_priority_init(); + thread_priority_init(); - return 0; + return 0; } #endif -- cgit v1.3.1 From f6bf69f233688952391da88bff961ad267de381c Mon Sep 17 00:00:00 2001 From: Grissiom Date: Sat, 21 Dec 2013 13:18:09 +0800 Subject: TC: more tolerate for tick in TC thread --- examples/kernel/semaphore_static.c | 8 ++++++-- examples/kernel/thread_delay.c | 4 ++-- examples/kernel/thread_priority.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'examples/kernel/thread_priority.c') diff --git a/examples/kernel/semaphore_static.c b/examples/kernel/semaphore_static.c index 2ffe3ae9e8..cb199886a4 100644 --- a/examples/kernel/semaphore_static.c +++ b/examples/kernel/semaphore_static.c @@ -27,9 +27,13 @@ static void thread_entry(void* parameter) result = rt_sem_take(&sem, 10); if (result == -RT_ETIMEOUT) { - /* 超时后判断是否刚好是10个OS Tick */ - if (rt_tick_get() - tick != 10) + rt_tick_t new_tick = rt_tick_get(); + /* 可以有两个 tick 的误差 */ + if (new_tick - tick >= 12) { + rt_kprintf("tick error to large: expect: 10, get %d\n", + new_tick - tick); + tc_done(TC_STAT_FAILED); rt_sem_detach(&sem); return; diff --git a/examples/kernel/thread_delay.c b/examples/kernel/thread_delay.c index 30b673ca11..f9404d704c 100644 --- a/examples/kernel/thread_delay.c +++ b/examples/kernel/thread_delay.c @@ -14,7 +14,7 @@ static void thread_entry(void* parameter) rt_kprintf("thread delay 10 tick\n"); tick = rt_tick_get(); rt_thread_delay(10); - if (rt_tick_get() - tick > 10) + if (rt_tick_get() - tick > 11) { tc_done(TC_STAT_FAILED); return; @@ -23,7 +23,7 @@ static void thread_entry(void* parameter) rt_kprintf("thread delay 15 tick\n"); tick = rt_tick_get(); rt_thread_delay(15); - if (rt_tick_get() - tick > 15) + if (rt_tick_get() - tick > 16) { tc_done(TC_STAT_FAILED); return; diff --git a/examples/kernel/thread_priority.c b/examples/kernel/thread_priority.c index 81a9bc0382..0045b0e578 100644 --- a/examples/kernel/thread_priority.c +++ b/examples/kernel/thread_priority.c @@ -45,21 +45,21 @@ int thread_priority_init() rt_err_t result; result = rt_thread_init(&thread1, - "t1", - thread1_entry, RT_NULL, - &thread1_stack[0], sizeof(thread1_stack), - THREAD_PRIORITY - 1, THREAD_TIMESLICE); - + "t1", + thread1_entry, RT_NULL, + &thread1_stack[0], sizeof(thread1_stack), + THREAD_PRIORITY - 1, THREAD_TIMESLICE); + if (result == RT_EOK) rt_thread_startup(&thread1); else tc_stat(TC_STAT_FAILED); rt_thread_init(&thread2, - "t2", - thread2_entry, RT_NULL, - &thread2_stack[0], sizeof(thread2_stack), - THREAD_PRIORITY + 1, THREAD_TIMESLICE); + "t2", + thread2_entry, RT_NULL, + &thread2_stack[0], sizeof(thread2_stack), + THREAD_PRIORITY + 1, THREAD_TIMESLICE); if (result == RT_EOK) rt_thread_startup(&thread2); -- cgit v1.3.1