luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net_timedwait() and net_lockedwait() no longer return errors via errno but returned negated errno values like other internal OS functions.

Browse source
This commit is contained in:
Gregory Nutt 2017-09-01 07:13:03 -06:00
parent 91d473b816
commit afe137ffbf
3 changed files with 63 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
TODO
View file

@ -229,7 +229,19 @@ o Task/Scheduler (sched/)
Changes like that could clean up some of this internal
craziness.  The condition variable change described above is
really a "bandaid" to handle the case that sem_wait() is a
cancellation point.
cancellation point. Also will need to revisit previous changes
like:
commit b4747286b19d3b15193b2a5e8a0fe48fa0a8638c
Author: Juha Niskanen (Haltian) <juha.niskanen@haltian.com>
Date: Tue Apr 11 11:03:25 2017 -0600
Add logic to disable cancellation points within the OS.
This is useful when an internal OS function that is NOT
a cancellation point calls an OS function which is a
cancellation point. In that case, irrecoverable states
may occur if the cancellation is within the OS.
Status: Open
Priority: Low. Things are working OK the way they are. But the design
could be improved and made a little more efficient with this

28
include/nuttx/net/net.h
View file

@ -268,7 +268,13 @@ void net_initialize(void);
* Name: net_lock
*
* Description:
* Take the lock
* Take the network lock
*
* Input Parameters:
* None
*
* Returned value:
* None
*
****************************************************************************/
@ -278,7 +284,13 @@ void net_lock(void);
* Name: net_unlock
*
* Description:
* Release the lock.
* Release the network lock.
*
* Input Parameters:
* None
*
* Returned value:
* None
*
****************************************************************************/
@ -296,9 +308,8 @@ void net_unlock(void);
* abstime - The absolute time to wait until a timeout is declared.
*
* Returned value:
* The returned value is the same as sem_timedwait(): Zero (OK) is
* returned on success; -1 (ERROR) is returned on a failure with the
* errno value set appropriately.
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/
@ -309,15 +320,14 @@ int net_timedwait(sem_t *sem, FAR const struct timespec *abstime);
* Name: net_lockedwait
*
* Description:
* Atomically wait for sem while temporarily releasing lock on the network.
* Atomically wait for sem while temporarily releasing the network lock.
*
* Input Parameters:
* sem - A reference to the semaphore to be taken.
*
* Returned value:
* The returned value is the same as sem_wait(): Zero (OK) is returned
* on success; -1 (ERROR) is returned on a failure with the errno value
* set appropriately.
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/

43
net/utils/net_lock.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/utils/net_lock.c
*
* Copyright (C) 2011-2012, 2014-2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2011-2012, 2014-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -73,7 +73,8 @@ static unsigned int g_count = 0;
* Name: _net_takesem
*
* Description:
* Take the semaphore
* Take the semaphore, waiting indefinitely.
* REVISIT: Should this return if -EINTR?
*
****************************************************************************/
@ -85,7 +86,7 @@ static void _net_takesem(void)
* awakened by a signal.
*/
ASSERT(get_errno() == EINTR);
DEBUGASSERT(get_errno() == EINTR);
}
}
@ -110,7 +111,13 @@ void net_lockinitialize(void)
* Name: net_lock
*
* Description:
* Take the lock
* Take the network lock
*
* Input Parameters:
* None
*
* Returned value:
* None
*
****************************************************************************/
@ -143,7 +150,13 @@ void net_lock(void)
* Name: net_unlock
*
* Description:
* Release the lock.
* Release the network lock.
*
* Input Parameters:
* None
*
* Returned value:
* None
*
****************************************************************************/
@ -181,9 +194,8 @@ void net_unlock(void)
* abstime - The absolute time to wait until a timeout is declared.
*
* Returned value:
* The returned value is the same as sem_wait() or sem_timedwait(): Zero
* (OK) is returned on success; -1 (ERROR) is returned on a failure with
* the errno value set appropriately.
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/
@ -231,6 +243,14 @@ int net_timedwait(sem_t *sem, FAR const struct timespec *abstime)
ret = sem_wait(sem);
}
/* REVISIT: errno really should not be used within the OS */
if (ret < 0)
{
ret = -get_errno();
DEBUGASSERT(ret < 0);
}
sched_unlock();
leave_critical_section(flags);
return ret;
@ -240,15 +260,14 @@ int net_timedwait(sem_t *sem, FAR const struct timespec *abstime)
* Name: net_lockedwait
*
* Description:
* Atomically wait for sem while temporarily releasing g_netlock.
* Atomically wait for sem while temporarily releasing the network lock.
*
* Input Parameters:
* sem - A reference to the semaphore to be taken.
*
* Returned value:
* The returned value is the same as sem_wait(): Zero (OK) is returned
* on success; -1 (ERROR) is returned on a failure with the errno value
* set appropriately.
* Zero (OK) is returned on success; a negated errno value is returned on
* any failure.
*
****************************************************************************/