Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/task_manage.c

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/kernel/task_manage.c (modified) (8 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/task_manage.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2017 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -126 +126 @@
 #ifdef TOPPERS_acre_tsk
 
-#ifndef TARGET_MIN_STKSZ
-#define TARGET_MIN_STKSZ        1U              /* 未定義の場合は0でないことをチェック */
-#endif /* TARGET_MIN_STKSZ */
-
 ER_UINT
 acre_tsk(const T_CTSK *pk_ctsk)
@@ -151 +147 @@
         stk = pk_ctsk->stk;
 
-        CHECK_RSATR(tskatr, TA_ACT|TA_NOACTQUE|TARGET_TSKATR);
+        CHECK_VALIDATR(tskatr, TA_ACT|TA_NOACTQUE|TARGET_TSKATR);
         CHECK_PAR(FUNC_ALIGN(task));
         CHECK_PAR(FUNC_NONNULL(task));
@@ -168 +164 @@
                 if (stk == NULL) {
                         stksz = ROUND_STK_T(stksz);
-                        stk = kernel_malloc(stksz);
+                        stk = malloc_mpk(stksz);
                         tskatr |= TA_MEMALLOC;
                 }
@@ -189 +185 @@
 
                         p_tcb->actque = false;
+                        p_tcb->p_lastmtx = NULL;
                         make_dormant(p_tcb);
                         if ((p_tcb->p_tinib->tskatr & TA_ACT) != 0U) {
                                 make_active(p_tcb);
+                                if (p_runtsk != p_schedtsk) {
+                                        dispatch();
+                                }
                         }
                         ercd = TSKID(p_tcb);
@@ -235 +235 @@
 #else /* USE_TSKINICTXB */
                 if ((p_tinib->tskatr & TA_MEMALLOC) != 0U) {    /*［NGKI1109］*/
-                        kernel_free(p_tinib->stk);
+                        free_mpk(p_tinib->stk);
                 }
 #endif /* USE_TSKINICTXB */
@@ -283 +283 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
@@ -423 +423 @@
         }
         if (tskpri == TPRI_INI) {
+                /*
+                 *  以下の代入文は，対象タスクが未登録の場合に無効なフィールド
+                 *  を参照するが，その場合はnewbpriの値を使わないので，問題な
+                 *  い．
+                 */
                 newbpri = p_tcb->p_tinib->ipriority;    /*［NGKI1199］*/
         }