sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "libs: misc: Remove critical section in lib_filesem.c for SMP"

Browse Source 
This reverts commit 191ada2296.
This commit is contained in:
Masayuki Ishikawa 2021-03-04 13:00:32 +09:00 committed by Xiang Xiao
parent 0d24582fe0
commit d412819160
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/libc/misc/lib_filesem.c
View File

@ -47,6 +47,10 @@
#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
@ -77,6 +81,10 @@ 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;
@ -108,6 +116,10 @@ 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
}
/****************************************************************************
@ -116,6 +128,10 @@ 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());
@ -136,6 +152,10 @@ 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 */