Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +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
graphics/nxterm/nxterm_sem.c
+4 -4
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* nuttx/graphics/nxterm/nxterm_sem.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -80,20 +80,20 @@ int nxterm_semwait(FAR struct nxterm_state_s *priv)
{
/* No.. then wait until the thread that does hold it is finished with it */
ret = sem_wait(&priv->exclsem);
ret = nxsem_wait(&priv->exclsem);
if (ret == OK)
{
/* No I hold the semaphore */
priv->holder = me;
}
return ret;
}
/* Abort, abort, abort! I have been re-entered */
set_errno(EBUSY);
return ERROR;
return -EBUSY;
}
int nxterm_sempost(FAR struct nxterm_state_s *priv)