From e03ac83ad3d22c578e367550d2ff714b53e79799 Mon Sep 17 00:00:00 2001
From: shaojinchun <shaojinchun@rt-thread.com>
Date: Tue, 5 Nov 2019 08:41:38 +0800
Subject: 将yield状态置于tcb的stat位域中
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/clock.c     |  2 +-
 src/scheduler.c | 12 ++++++------
 src/thread.c    |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/clock.c b/src/clock.c
index e288ff58a9..9b54101363 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -89,7 +89,7 @@ void rt_tick_increase(void)
         /* change to initialized tick */
         thread->remaining_tick = thread->init_tick;
 
-        thread->can_yield = RT_TRUE;
+        thread->stat |= RT_THREAD_STAT_YIELD;
 
         /* yield */
         rt_thread_yield();
diff --git a/src/scheduler.c b/src/scheduler.c
index c58ecf6209..edcf11dba5 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -344,13 +344,13 @@ void rt_schedule(void)
                 {
                     to_thread = current_thread;
                 }
-                else if (current_thread->current_priority == highest_ready_priority && current_thread->can_yield == RT_FALSE)
+                else if (current_thread->current_priority == highest_ready_priority && (current_thread->stat & RT_THREAD_STAT_YIELD_MASK) == 0)
                 {
                     to_thread = current_thread;
                 }
                 else
                 {
-                    current_thread->can_yield = RT_FALSE;
+                    current_thread->stat &= ~RT_THREAD_STAT_YIELD_MASK;
                     rt_schedule_insert_thread(current_thread);
                 }
             }
@@ -440,13 +440,13 @@ void rt_schedule(void)
                 {
                     to_thread = rt_current_thread;
                 }
-                else if (rt_current_thread->current_priority == highest_ready_priority && rt_current_thread->can_yield == RT_FALSE)
+                else if (rt_current_thread->current_priority == highest_ready_priority && (rt_current_thread->stat & RT_THREAD_STAT_YIELD_MASK) == 0)
                 {
                     to_thread = rt_current_thread;
                 }
                 else
                 {
-                    rt_current_thread->can_yield = RT_FALSE;
+                    rt_current_thread->stat &= ~RT_THREAD_STAT_YIELD_MASK;
                     need_insert_from_thread = 1;
                 }
             }
@@ -588,13 +588,13 @@ void rt_scheduler_do_irq_switch(void *context)
                 {
                     to_thread = current_thread;
                 }
-                else if (current_thread->current_priority == highest_ready_priority && current_thread->can_yield == RT_FALSE)
+                else if (current_thread->current_priority == highest_ready_priority && (current_thread->stat & RT_THREAD_STAT_YIELD_MASK) == 0)
                 {
                     to_thread = current_thread;
                 }
                 else
                 {
-                    current_thread->can_yield = RT_FALSE;
+                    current_thread->stat &= ~RT_THREAD_STAT_YIELD_MASK;
                     rt_schedule_insert_thread(current_thread);
                 }
             }
diff --git a/src/thread.c b/src/thread.c
index 6f6fa1029a..a88729e52c 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -159,7 +159,6 @@ static rt_err_t _rt_thread_init(struct rt_thread *thread,
     /* tick init */
     thread->init_tick      = tick;
     thread->remaining_tick = tick;
-    thread->can_yield      = RT_FALSE;
 
     /* error and flags */
     thread->error = RT_EOK;
-- 
cgit v1.3.1