You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/06/04 21:20:56 UTC
[incubator-nuttx] 02/03: arch: Rename _exit to up_exit to follow
the naming convention
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b4bd9427f78dc8c743fc2315aaa8c5a5a36be9fe
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jun 4 14:31:23 2020 +0800
arch: Rename _exit to up_exit to follow the naming convention
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I2779a2a3ccb5426fe78714fdcc629b8dfbb7aaf6
---
Documentation/NuttxPortingGuide.html | 6 +++---
arch/arm/src/common/arm_exit.c | 4 ++--
arch/avr/src/common/up_exit.c | 4 ++--
arch/hc/src/common/up_exit.c | 4 ++--
arch/mips/src/common/mips_exit.c | 4 ++--
arch/misoc/src/lm32/lm32_exit.c | 4 ++--
arch/misoc/src/minerva/minerva_exit.c | 4 ++--
arch/or1k/src/common/up_exit.c | 4 ++--
arch/renesas/src/common/up_exit.c | 4 ++--
arch/risc-v/src/common/riscv_exit.c | 4 ++--
arch/sim/src/sim/up_exit.c | 4 ++--
arch/x86/src/common/up_exit.c | 4 ++--
arch/x86_64/src/common/up_exit.c | 4 ++--
arch/xtensa/src/common/xtensa_exit.c | 4 ++--
arch/z16/src/common/z16_exit.c | 4 ++--
arch/z80/src/common/z80_exit.c | 4 ++--
include/nuttx/arch.h | 4 +++-
sched/task/exit.c | 16 ++++++++++++++++
18 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 0bd36b8..1fe1a96 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -78,7 +78,7 @@
<a href="#upblocktask">4.2.9 <code>up_block_task()</code></a><br>
<a href="#upreleasepending">4.2.10 <code>up_release_pending()</code></a><br>
<a href="#upreprioritizertr">4.2.11 <code>up_reprioritize_rtr()</code></a><br>
- <a href="#_exit">4.2.12 <code>_exit()</code></a><br>
+ <a href="#upexit">4.2.12 <code>up_exit()</code></a><br>
<a href="#upassert">4.2.13 <code>up_assert()</code></a><br>
<a href="#upschedulesigaction">4.2.14 <code>up_schedule_sigaction()</code></a><br>
<a href="#upallocateheap">4.2.15 <code>up_allocate_heap()</code></a><br>
@@ -2131,8 +2131,8 @@ The specific environmental definitions are unique for each board but should incl
</li>
</ul>
-<h3><a name="_exit">4.2.12 <code>_exit()</code></a></h3>
-<p><b>Function Prototype</b>: <code>void _exit(int status) noreturn_function;</code></p>
+<h3><a name="up_exit">4.2.12 <code>up_exit()</code></a></h3>
+<p><b>Function Prototype</b>: <code>void up_exit(int status) noreturn_function;</code></p>
<p><b>Description</b>.
This function causes the currently executing task to cease
diff --git a/arch/arm/src/common/arm_exit.c b/arch/arm/src/common/arm_exit.c
index 1941387..925a5a4 100644
--- a/arch/arm/src/common/arm_exit.c
+++ b/arch/arm/src/common/arm_exit.c
@@ -114,7 +114,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -124,7 +124,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 051b7fd..7673b2a 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -129,7 +129,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -139,7 +139,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index cb2be42..c196202 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -113,7 +113,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -123,7 +123,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/mips/src/common/mips_exit.c b/arch/mips/src/common/mips_exit.c
index fd85164..9565486 100644
--- a/arch/mips/src/common/mips_exit.c
+++ b/arch/mips/src/common/mips_exit.c
@@ -131,7 +131,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -141,7 +141,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/misoc/src/lm32/lm32_exit.c b/arch/misoc/src/lm32/lm32_exit.c
index 8c6f7d8..b943ea1 100644
--- a/arch/misoc/src/lm32/lm32_exit.c
+++ b/arch/misoc/src/lm32/lm32_exit.c
@@ -124,7 +124,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -134,7 +134,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/misoc/src/minerva/minerva_exit.c b/arch/misoc/src/minerva/minerva_exit.c
index 61e4499..5db7e3d 100644
--- a/arch/misoc/src/minerva/minerva_exit.c
+++ b/arch/misoc/src/minerva/minerva_exit.c
@@ -122,7 +122,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -132,7 +132,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/or1k/src/common/up_exit.c b/arch/or1k/src/common/up_exit.c
index f37a940..36fb194 100644
--- a/arch/or1k/src/common/up_exit.c
+++ b/arch/or1k/src/common/up_exit.c
@@ -129,7 +129,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -139,7 +139,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/renesas/src/common/up_exit.c b/arch/renesas/src/common/up_exit.c
index 03d5459..e9568b4 100644
--- a/arch/renesas/src/common/up_exit.c
+++ b/arch/renesas/src/common/up_exit.c
@@ -113,7 +113,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -123,7 +123,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/risc-v/src/common/riscv_exit.c b/arch/risc-v/src/common/riscv_exit.c
index 051558e..b1c483c 100644
--- a/arch/risc-v/src/common/riscv_exit.c
+++ b/arch/risc-v/src/common/riscv_exit.c
@@ -131,7 +131,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -141,7 +141,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/sim/src/sim/up_exit.c b/arch/sim/src/sim/up_exit.c
index af83470..fada99a 100644
--- a/arch/sim/src/sim/up_exit.c
+++ b/arch/sim/src/sim/up_exit.c
@@ -53,7 +53,7 @@
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -63,7 +63,7 @@
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
FAR struct tcb_s *tcb = this_task();
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 95533a2..8d69554 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -113,7 +113,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease to exist.
@@ -123,7 +123,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/x86_64/src/common/up_exit.c b/arch/x86_64/src/common/up_exit.c
index cd55324..b1f8b15 100644
--- a/arch/x86_64/src/common/up_exit.c
+++ b/arch/x86_64/src/common/up_exit.c
@@ -117,7 +117,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease to exist.
@@ -127,7 +127,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb;
diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c
index 95ab3d5..5e00a35 100644
--- a/arch/xtensa/src/common/xtensa_exit.c
+++ b/arch/xtensa/src/common/xtensa_exit.c
@@ -130,7 +130,7 @@ static void _xtensa_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -140,7 +140,7 @@ static void _xtensa_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
struct tcb_s *tcb = this_task();
diff --git a/arch/z16/src/common/z16_exit.c b/arch/z16/src/common/z16_exit.c
index 6a7fc47..3c92450 100644
--- a/arch/z16/src/common/z16_exit.c
+++ b/arch/z16/src/common/z16_exit.c
@@ -113,7 +113,7 @@ static void _z16_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -123,7 +123,7 @@ static void _z16_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
FAR struct tcb_s *tcb = this_task();
diff --git a/arch/z80/src/common/z80_exit.c b/arch/z80/src/common/z80_exit.c
index 29f8887..e9e47d1 100644
--- a/arch/z80/src/common/z80_exit.c
+++ b/arch/z80/src/common/z80_exit.c
@@ -115,7 +115,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
****************************************************************************/
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -125,7 +125,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
*
****************************************************************************/
-void _exit(int status)
+void up_exit(int status)
{
FAR struct tcb_s *tcb = this_task();
diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
index 565fbc7..eccf4d0 100644
--- a/include/nuttx/arch.h
+++ b/include/nuttx/arch.h
@@ -450,7 +450,7 @@ void up_release_pending(void);
void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority);
/****************************************************************************
- * Name: _exit
+ * Name: up_exit
*
* Description:
* This function causes the currently executing task to cease
@@ -464,6 +464,8 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority);
*
****************************************************************************/
+void up_exit() noreturn_function;
+
/* Prototype is in unistd.h */
/****************************************************************************
diff --git a/sched/task/exit.c b/sched/task/exit.c
index 1ebf075..90c6c21 100644
--- a/sched/task/exit.c
+++ b/sched/task/exit.c
@@ -40,6 +40,22 @@
****************************************************************************/
/****************************************************************************
+ * Name: _exit
+ *
+ * Description:
+ * This function causes the currently executing task to cease
+ * to exist. This is a special case of task_delete() where the task to
+ * be deleted is the currently executing task. It is more complex because
+ * a context switch must be perform to the next ready to run task.
+ *
+ ****************************************************************************/
+
+void _exit(int status)
+{
+ up_exit(status);
+}
+
+/****************************************************************************
* Name: exit
*
* Description: