Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/heap: Replace _SEM_GETERROR with _SEM_ERRVAL

Browse Source 
and change nxsem_init to _SEM_INIT

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I84ad710c3ebe92d31d6c8dc1ddf6b63c10494ce2
This commit is contained in:
Xiang Xiao
2021-03-09 14:23:52 +08:00
parent 35b12f7cfe
commit cbeb35c646
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/mm_heap/mm_sem.c
+3 -28
View File
@@ -58,26 +58,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Internal nxsem_* interfaces are not available in the user space in
* PROTECTED and KERNEL builds. In that context, the application semaphore
* interfaces must be used. The differences between the two sets of
* interfaces are: (1) the nxsem_* interfaces do not cause cancellation
* points and (2) they do not modify the errno variable.
*
* See additional definitions in include/nuttx/semaphore.h
*
* REVISIT: The fact that sem_wait() is a cancellation point is an issue
* and does cause a violation: It makes all of the memory management
* interfaces into cancellation points when used from user space in the
* PROTECTED and KERNEL builds.
*/
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
# define _SEM_GETERROR(r)
#else
# define _SEM_GETERROR(r) (r) = -errno
#endif
/* This is a special value that indicates that there is no holder of the
* semaphore. The valid range of PIDs is 0-32767 and any value outside of
* that range could be used (except -ESRCH which is a special return value
@@ -121,7 +101,7 @@ void mm_seminitialize(FAR struct mm_heap_s *heap)
* private data sets).
*/
nxsem_init(&heap_impl->mm_semaphore, 0, 1);
_SEM_INIT(&heap_impl->mm_semaphore, 0, 1);
heap_impl->mm_holder = NO_HOLDER;
heap_impl->mm_counts_held = 0;
@@ -205,7 +185,7 @@ int mm_trysemaphore(FAR struct mm_heap_s *heap)
ret = _SEM_TRYWAIT(&heap_impl->mm_semaphore);
if (ret < 0)
{
_SEM_GETERROR(ret);
ret = _SEM_ERRVAL(ret);
goto errout;
}
@@ -270,13 +250,8 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
if (ret < 0)
{
#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
ret = _SEM_ERRVAL(ret);
DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
#else
int errcode = get_errno();
DEBUGASSERT(errcode == EINTR || errcode == ECANCELED);
ret = -errcode;
#endif
}
}
while (ret == -EINTR);