Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 03:05:40 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
This commit backs out most of commit b4747286b1.  That change was added because sem_wait() would sometimes cause cancellation points inappropriated.  But with these recent changes, nxsem_wait() is used instead and it is not a cancellation point.

    In the OS, all calls to sem_wait() changed to nxsem_wait().  nxsem_wait() does not return errors via errno so each place where nxsem_wait() is now called must not examine the errno variable.

    In all OS functions (not libraries), change sem_wait() to nxsem_wait().  This will prevent the OS from creating bogus cancellation points and from modifying the per-task errno variable.

    sched/semaphore:  Add the function nxsem_wait().  This is a new internal OS interface.  It is functionally equivalent to sem_wait() except that (1) it is not a cancellation point, and (2) it does not set the per-thread errno value on return.
This commit is contained in:
Gregory Nutt
2017-10-04 15:22:27 -06:00
parent 42a0796615
commit 9568600ab1
307 changed files with 3421 additions and 2423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/aio/aio_initialize.c
+24 -5
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* fs/aio/aio_initialize.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -157,12 +157,21 @@ void aio_lock(void)
}
else
{
int ret;
/* No.. take the semaphore */
while (sem_wait(&g_aio_exclsem) < 0)
do
{
DEBUGASSERT(get_errno() == EINTR);
ret = nxsem_wait(&g_aio_exclsem);
/* The only case that an error should occur here is if the wait
* was awakened by a signal.
*/
DEBUGASSERT(ret == OK || ret == -EINTR);
}
while (ret == -EINTR);
/* And mark it as ours */
@@ -215,15 +224,25 @@ void aio_unlock(void)
FAR struct aio_container_s *aioc_alloc(void)
{
FAR struct aio_container_s *aioc;
int ret;
/* Take a count from semaphore, thus guaranteeing that we have an AIO
* container set aside for us.
*/
while (sem_wait(&g_aioc_freesem) < 0)
do
{
DEBUGASSERT(get_errno() == EINTR);
/* Take the semaphore (perhaps waiting) */
ret = nxsem_wait(&g_aioc_freesem);
/* The only case that an error should occur here is if the wait was
* awakened by a signal.
*/
DEBUGASSERT(ret == OK || ret == -EINTR);
}
while (ret == -EINTR);
/* Get our AIO container */