Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +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
drivers/input/tsc2007.c
+25 -20
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* drivers/input/tsc2007.c
*
* Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2011-2012, 2016-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* References:
@@ -377,7 +377,7 @@ static int tsc2007_waitsample(FAR struct tsc2007_dev_s *priv,
/* Wait for a change in the TSC2007 state */
priv->nwaiters++;
ret = sem_wait(&priv->waitsem);
ret = nxsem_wait(&priv->waitsem);
priv->nwaiters--;
if (ret < 0)
@@ -386,8 +386,8 @@ static int tsc2007_waitsample(FAR struct tsc2007_dev_s *priv,
* the failure now.
*/
DEBUGASSERT(errno == EINTR);
ret = -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
goto errout;
}
}
@@ -397,7 +397,7 @@ static int tsc2007_waitsample(FAR struct tsc2007_dev_s *priv,
* Interrupts and pre-emption will be re-enabled while we wait.
*/
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
errout:
/* Then re-enable interrupts. We might get interrupt here and there
@@ -815,13 +815,14 @@ static int tsc2007_open(FAR struct file *filep)
/* Get exclusive access to the driver data structure */
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
return ret;
}
/* Increment the reference count */
@@ -870,13 +871,14 @@ static int tsc2007_close(FAR struct file *filep)
/* Get exclusive access to the driver data structure */
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
return ret;
}
/* Decrement the reference count unless it would decrement a negative
@@ -927,13 +929,14 @@ static ssize_t tsc2007_read(FAR struct file *filep, FAR char *buffer, size_t len
/* Get exclusive access to the driver data structure */
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
return ret;
}
/* Try to read sample data. */
@@ -1043,13 +1046,14 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Get exclusive access to the driver data structure */
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
return ret;
}
/* Process the IOCTL by command */
@@ -1119,13 +1123,14 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* Are we setting up the poll? Or tearing it down? */
ret = sem_wait(&priv->devsem);
ret = nxsem_wait(&priv->devsem);
if (ret < 0)
{
/* This should only happen if the wait was cancelled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
ierr("ERROR: nxsem_wait failed: %d\n", ret);
DEBUGASSERT(ret == -EINTR);
return ret;
}
if (setup)