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

sched/semaphore/spinlock.c: Remove support for re-entrant spinlocks. They seem like a good idea, but they are never used.

Browse Source
This commit is contained in:
Xiang Xiao
2019-11-03 19:38:39 -06:00
committed by Gregory Nutt
parent e805bc0660
commit e1a89d29ee
2 changed files with 1 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/spinlock.h
+1 -96
View File
@@ -66,7 +66,7 @@
/* Memory barriers may be provided in arch/spinlock.h
*
* DMB - Data memory barrier. Assures writes are completed to memory.
* DSB - Data syncrhonization barrier.
* DSB - Data synchronization barrier.
*/
#undef __SP_UNLOCK_FUNCTION
@@ -96,22 +96,6 @@
# define SP_SECTION
#endif
/****************************************************************************
* Public Types
****************************************************************************/
struct spinlock_s
{
volatile spinlock_t sp_lock; /* Indicates if the spinlock is locked or
* not. See the* values SP_LOCKED and
* SP_UNLOCKED. */
#ifdef CONFIG_SMP
uint8_t sp_cpu; /* CPU holding the lock */
uint16_t sp_count; /* The count of references by this CPU on
* the lock */
#endif
};
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
@@ -156,22 +140,6 @@ spinlock_t up_testset(volatile FAR spinlock_t *lock);
/* void spin_initialize(FAR spinlock_t *lock, spinlock_t state); */
#define spin_initialize(l,s) do { *(l) = (s); } while (0)
/****************************************************************************
* Name: spin_initializer
*
* Description:
* Initialize a re-entrant spinlock object to its initial, unlocked state.
*
* Input Parameters:
* lock - A reference to the spinlock object to be initialized.
*
* Returned Value:
* None.
*
****************************************************************************/
void spin_initializer(FAR struct spinlock_s *lock);
/****************************************************************************
* Name: spin_lock
*
@@ -242,33 +210,6 @@ void spin_lock_wo_note(FAR volatile spinlock_t *lock);
#define spin_trylock(l) up_testset(l)
/****************************************************************************
* Name: spin_lockr
*
* Description:
* If this CPU does not already hold the spinlock, then loop until the
* spinlock is successfully locked.
*
* This implementation is re-entrant in the sense that it can called
* numerous times from the same CPU without blocking. Of course,
* spin_unlock() must be called the same number of times. NOTE: the
* thread that originallly took the look may be executing on a different
* CPU when it unlocks the spinlock.
*
* Input Parameters:
* lock - A reference to the spinlock object to lock.
*
* Returned Value:
* None. When the function returns, the spinlock was successfully locked
* by this CPU.
*
* Assumptions:
* Not running at the interrupt level.
*
****************************************************************************/
void spin_lockr(FAR struct spinlock_s *lock);
/****************************************************************************
* Name: spin_unlock
*
@@ -314,25 +255,6 @@ void spin_unlock(FAR volatile spinlock_t *lock);
void spin_unlock_wo_note(FAR volatile spinlock_t *lock);
/****************************************************************************
* Name: spin_unlockr
*
* Description:
* Release one count on a re-entrant spinlock.
*
* Input Parameters:
* lock - A reference to the spinlock object to unlock.
*
* Returned Value:
* None.
*
* Assumptions:
* Not running at the interrupt level.
*
****************************************************************************/
void spin_unlockr(FAR struct spinlock_s *lock);
/****************************************************************************
* Name: spin_islocked
*
@@ -350,23 +272,6 @@ void spin_unlockr(FAR struct spinlock_s *lock);
/* bool spin_islocked(FAR spinlock_t lock); */
#define spin_islocked(l) (*(l) == SP_LOCKED)
/****************************************************************************
* Name: spin_islockedr
*
* Description:
* Release one count on a re-entrant spinlock.
*
* Input Parameters:
* lock - A reference to the spinlock object to test.
*
* Returned Value:
* A boolean value: true the spinlock is locked; false if it is unlocked.
*
****************************************************************************/
/* bool spin_islockedr(FAR struct spinlock_s *lock); */
#define spin_islockedr(l) ((l)->sp_lock == SP_LOCKED)
/****************************************************************************
* Name: spin_setbit
*