This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 191ada2 libs: misc: Remove critical section in lib_filesem.c for SMP
191ada2 is described below
commit 191ada2296b9fed543f678e2f0501f388b1f8024
Author: Masayuki Ishikawa <masayuki.ishik...@gmail.com>
AuthorDate: Mon Mar 1 09:46:20 2021 +0900
libs: misc: Remove critical section in lib_filesem.c for SMP
Summary:
- The code was added in Mar 2018 to stabilize the SMP kernel
- I confirmed that the code is no longer needed now.
Impact:
- SMP only
Testing:
- Tested with ostest the following configs
- esp32-devkitc:smp (QEMU), sabre-6quad:smp (QEMU)
- maix-bit:smp (QEMU), sim:smp
- spresense:smp
- Tested with nxplayer and stress test with spresense:wifi_smp
Signed-off-by: Masayuki Ishikawa <masayuki.ishik...@jp.sony.com>
---
libs/libc/misc/lib_filesem.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/libs/libc/misc/lib_filesem.c b/libs/libc/misc/lib_filesem.c
index 5550d06..480d35c 100644
--- a/libs/libc/misc/lib_filesem.c
+++ b/libs/libc/misc/lib_filesem.c
@@ -47,10 +47,6 @@
#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
-#ifdef CONFIG_SMP
-# include <nuttx/irq.h>
-#endif
-
#include "libc.h"
#ifndef CONFIG_STDIO_DISABLE_BUFFERING
@@ -81,10 +77,6 @@ void lib_sem_initialize(FAR struct file_struct *stream)
void lib_take_semaphore(FAR struct file_struct *stream)
{
-#ifdef CONFIG_SMP
- irqstate_t flags = enter_critical_section();
-#endif
-
pid_t my_pid = getpid();
int ret;
@@ -116,10 +108,6 @@ void lib_take_semaphore(FAR struct file_struct *stream)
stream->fs_holder = my_pid;
stream->fs_counts = 1;
}
-
-#ifdef CONFIG_SMP
- leave_critical_section(flags);
-#endif
}
/****************************************************************************
@@ -128,10 +116,6 @@ void lib_take_semaphore(FAR struct file_struct *stream)
void lib_give_semaphore(FAR struct file_struct *stream)
{
-#ifdef CONFIG_SMP
- irqstate_t flags = enter_critical_section();
-#endif
-
/* I better be holding at least one reference to the semaphore */
DEBUGASSERT(stream->fs_holder == getpid());
@@ -152,10 +136,6 @@ void lib_give_semaphore(FAR struct file_struct *stream)
stream->fs_counts = 0;
DEBUGVERIFY(_SEM_POST(&stream->fs_sem));
}
-
-#ifdef CONFIG_SMP
- leave_critical_section(flags);
-#endif
}
#endif /* CONFIG_STDIO_DISABLE_BUFFERING */
