From f7b14218800ad7ed6c47c67d4d043a3340d63116 Mon Sep 17 00:00:00 2001
From: Grissiom <chaos.proton@gmail.com>
Date: Sat, 21 Dec 2013 12:51:52 +0800
Subject: TC: expand TABs

---
 examples/kernel/thread_delay.c | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'examples/kernel/thread_delay.c')

diff --git a/examples/kernel/thread_delay.c b/examples/kernel/thread_delay.c
index 23d25d6d5c..30b673ca11 100644
--- a/examples/kernel/thread_delay.c
+++ b/examples/kernel/thread_delay.c
@@ -8,63 +8,63 @@ static struct rt_thread thread;
 static char thread_stack[THREAD_STACK_SIZE];
 static void thread_entry(void* parameter)
 {
-	rt_tick_t tick;
-	rt_kprintf("thread inited ok\n");
+    rt_tick_t tick;
+    rt_kprintf("thread inited ok\n");
 
-	rt_kprintf("thread delay 10 tick\n");
-	tick = rt_tick_get();
-	rt_thread_delay(10);
-	if (rt_tick_get() - tick > 10)
-	{
-		tc_done(TC_STAT_FAILED);
-		return;
-	}
+    rt_kprintf("thread delay 10 tick\n");
+    tick = rt_tick_get();
+    rt_thread_delay(10);
+    if (rt_tick_get() - tick > 10)
+    {
+        tc_done(TC_STAT_FAILED);
+        return;
+    }
 
-	rt_kprintf("thread delay 15 tick\n");
-	tick = rt_tick_get();
-	rt_thread_delay(15);
-	if (rt_tick_get() - tick > 15)
-	{
-		tc_done(TC_STAT_FAILED);
-		return;
-	}
+    rt_kprintf("thread delay 15 tick\n");
+    tick = rt_tick_get();
+    rt_thread_delay(15);
+    if (rt_tick_get() - tick > 15)
+    {
+        tc_done(TC_STAT_FAILED);
+        return;
+    }
 
-	rt_kprintf("thread exit\n");
+    rt_kprintf("thread exit\n");
 
-	tc_done(TC_STAT_PASSED);
+    tc_done(TC_STAT_PASSED);
 }
 
 rt_err_t thread_delay_init()
 {
-	rt_err_t result;
+    rt_err_t result;
 
-	result = rt_thread_init(&thread,
-		"test",
-		thread_entry, RT_NULL,
-		&thread_stack[0], sizeof(thread_stack),
-		THREAD_PRIORITY, 10);
+    result = rt_thread_init(&thread,
+        "test",
+        thread_entry, RT_NULL,
+        &thread_stack[0], sizeof(thread_stack),
+        THREAD_PRIORITY, 10);
 
-	if (result == RT_EOK)
-		rt_thread_startup(&thread);
-	else
-		tc_stat(TC_STAT_END | TC_STAT_FAILED);
+    if (result == RT_EOK)
+        rt_thread_startup(&thread);
+    else
+        tc_stat(TC_STAT_END | TC_STAT_FAILED);
 
-	return result;
+    return result;
 }
 
 #ifdef RT_USING_TC
 int _tc_thread_delay()
 {
-	thread_delay_init();
+    thread_delay_init();
 
-	return 30;
+    return 30;
 }
 FINSH_FUNCTION_EXPORT(_tc_thread_delay, a thread delay test);
 #else
 int rt_application_init()
 {
-	thread_delay_init();
+    thread_delay_init();
 
-	return 0;
+    return 0;
 }
 #endif
-- 
cgit v1.3.1


From f6bf69f233688952391da88bff961ad267de381c Mon Sep 17 00:00:00 2001
From: Grissiom <chaos.proton@gmail.com>
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_delay.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