[kernel] rearrange rt_thread_control() - schedule the thread when close it

components/libc/compilers/common/stdlib.c

@@ -14,18 +14,10 @@ void __rt_libc_exit(int status)
 {
     rt_thread_t self = rt_thread_self();
 
-#ifdef RT_USING_MODULE
-    if (dlmodule_self())
-    {
-        dlmodule_exit(status);
-    }
-#endif
-
     if (self != RT_NULL)
     {
         rt_kprintf("thread:%s exit:%d!\n", self->name, status);
-        rt_thread_suspend(self);
-        rt_schedule();
+        rt_thread_control(self, RT_THREAD_CTRL_CLOSE, RT_NULL);
     }
 }
 

src/thread.c

@@ -26,6 +26,7 @@
  *                             bug when thread has not startup.
  * 2018-11-22     Jesven       yield is same to rt_schedule
  *                             add support for tasks bound to cpu
+ * 2021-02-24     Meco Man     rearrange rt_thread_control() - schedule the thread when close it
  */
 
 #include <rthw.h>
@@ -671,6 +672,7 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
     switch (cmd)
     {
         case RT_THREAD_CTRL_CHANGE_PRIORITY:
+        {
             /* disable interrupt */
             temp = rt_hw_interrupt_disable();
 
@@ -684,13 +686,13 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
                 thread->current_priority = *(rt_uint8_t *)arg;
 
                 /* recalculate priority attribute */
-#if RT_THREAD_PRIORITY_MAX > 32
+    #if RT_THREAD_PRIORITY_MAX > 32
                 thread->number      = thread->current_priority >> 3;            /* 5bit */
                 thread->number_mask = 1 << thread->number;
                 thread->high_mask   = 1 << (thread->current_priority & 0x07);   /* 3bit */
-#else
+    #else
                 thread->number_mask = 1 << thread->current_priority;
-#endif
+    #endif
 
                 /* insert thread to schedule queue again */
                 rt_schedule_insert_thread(thread);
@@ -700,36 +702,44 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
                 thread->current_priority = *(rt_uint8_t *)arg;
 
                 /* recalculate priority attribute */
-#if RT_THREAD_PRIORITY_MAX > 32
+    #if RT_THREAD_PRIORITY_MAX > 32
                 thread->number      = thread->current_priority >> 3;            /* 5bit */
                 thread->number_mask = 1 << thread->number;
                 thread->high_mask   = 1 << (thread->current_priority & 0x07);   /* 3bit */
-#else
+    #else
                 thread->number_mask = 1 << thread->current_priority;
-#endif
+    #endif
             }
 
             /* enable interrupt */
             rt_hw_interrupt_enable(temp);
             break;
+        }
 
         case RT_THREAD_CTRL_STARTUP:
+        {
             return rt_thread_startup(thread);
+        }
 
         case RT_THREAD_CTRL_CLOSE:
+        {
+            rt_err_t rt_err;
 
             if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
             {
-            return rt_thread_detach(thread);
+                rt_err = rt_thread_detach(thread);
             }
-#ifdef RT_USING_HEAP
+    #ifdef RT_USING_HEAP
             else
             {
-            return rt_thread_delete(thread);
+                rt_err = rt_thread_delete(thread);
+            }
+    #endif
+            rt_schedule();
+            return rt_err;
         }
-#endif
 
-#ifdef RT_USING_SMP
+    #ifdef RT_USING_SMP
         case RT_THREAD_CTRL_BIND_CPU:
         {
             rt_uint8_t cpu;
@@ -744,7 +754,8 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
             thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu;
             break;
         }
-#endif /*RT_USING_SMP*/
+    #endif /*RT_USING_SMP*/
+
         default:
             break;
     }