summaryrefslogtreecommitdiffstats
path: root/cpukit/posix/include/rtems/posix
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-11-16 14:50:09 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-11-23 12:52:06 +0100
commitc42be504c92d76d2e06d0fc8ebd05fc913376d2d (patch)
tree259f8a712a6139f427888647955bc3c95480877e /cpukit/posix/include/rtems/posix
parentscore: Add RTEMS_ALIAS() (diff)
downloadrtems-c42be504c92d76d2e06d0fc8ebd05fc913376d2d.tar.bz2
posix: Add self-contained pthread spinlock
Turn pthread_spinlock_t into a self-contained object. On uni-processor configurations, interrupts are disabled in the lock/trylock operations and the previous interrupt status is restored in the corresponding unlock operations. On SMP configurations, a ticket lock is a acquired and released in addition. The self-contained pthread_spinlock_t object is defined by Newlib in <sys/_pthreadtypes.h>. typedef struct { struct _Ticket_lock_Control _lock; __uint32_t _interrupt_state; } pthread_spinlock_t; This implementation is simple and efficient. However, this test case of the Linux Test Project would fail due to call of printf() and sleep() during spin lock ownership: https://github.com/linux-test-project/ltp/blob/master/testcases/open_posix_testsuite/conformance/interfaces/pthread_spin_lock/1-2.c There is only limited support for profiling on SMP configurations. Delete CORE spinlock implementation. Update #2674.
Diffstat (limited to 'cpukit/posix/include/rtems/posix')
-rw-r--r--cpukit/posix/include/rtems/posix/config.h6
-rw-r--r--cpukit/posix/include/rtems/posix/spinlock.h63
-rw-r--r--cpukit/posix/include/rtems/posix/spinlockimpl.h81
3 files changed, 38 insertions, 112 deletions
diff --git a/cpukit/posix/include/rtems/posix/config.h b/cpukit/posix/include/rtems/posix/config.h
index 636f1e7d79..11c73c2b2f 100644
--- a/cpukit/posix/include/rtems/posix/config.h
+++ b/cpukit/posix/include/rtems/posix/config.h
@@ -111,12 +111,6 @@ typedef struct {
uint32_t maximum_rwlocks;
/**
- * This field contains the maximum number of POSIX API
- * spinlocks which are configured for this application.
- */
- uint32_t maximum_spinlocks;
-
- /**
* This field contains the number of POSIX API Initialization
* threads listed in @a User_initialization_thread_table.
*/
diff --git a/cpukit/posix/include/rtems/posix/spinlock.h b/cpukit/posix/include/rtems/posix/spinlock.h
deleted file mode 100644
index 8da451ce22..0000000000
--- a/cpukit/posix/include/rtems/posix/spinlock.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file
- *
- * @brief POSIX Spinlock Support
- *
- * This include file contains all the constants and structures associated
- * with the POSIX Spinlock Manager.
- *
- * Directives provided are:
- *
- * - create a spinlock
- * - delete a spinlock
- * - wait for a spinlock
- */
-
-/*
- * COPYRIGHT (c) 1989-2011.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef _RTEMS_POSIX_SPINLOCK_H
-#define _RTEMS_POSIX_SPINLOCK_H
-
-#include <rtems/score/object.h>
-#include <rtems/score/corespinlock.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup POSIX_SPINLOCK POSIX Spinlock Support
- *
- * @ingroup POSIXAPI
- *
- * @brief Constants and Structures Associated with the POSIX Spinlock Manager
- *
- */
-/**@{**/
-
-/**
- * This type defines the control block used to manage each spinlock.
- */
-
-typedef struct {
- /** This is used to manage a spinlock as an object. */
- Objects_Control Object;
- /** This is used to implement the spinlock. */
- CORE_spinlock_Control Spinlock;
-} POSIX_Spinlock_Control;
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/cpukit/posix/include/rtems/posix/spinlockimpl.h b/cpukit/posix/include/rtems/posix/spinlockimpl.h
index f1b5639bd1..36ef6677a0 100644
--- a/cpukit/posix/include/rtems/posix/spinlockimpl.h
+++ b/cpukit/posix/include/rtems/posix/spinlockimpl.h
@@ -11,6 +11,8 @@
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
+ * Copyright (c) 2016 embedded brains GmbH
+ *
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
@@ -19,62 +21,55 @@
#ifndef _RTEMS_POSIX_SPINLOCKIMPL_H
#define _RTEMS_POSIX_SPINLOCKIMPL_H
-#include <rtems/posix/spinlock.h>
-#include <rtems/score/corespinlockimpl.h>
-#include <rtems/score/objectimpl.h>
-
#include <pthread.h>
+#include <rtems/score/isrlevel.h>
+
+#if defined(RTEMS_SMP)
+#include <rtems/score/percpu.h>
+#include <rtems/score/smplockticket.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
-/**
- * The following defines the information control block used to manage
- * this class of objects.
- */
+#if SIZEOF_PTHREAD_SPINLOCK_T > 4
+#define POSIX_SPINLOCKS_ARE_SELF_CONTAINED
+#endif
-extern Objects_Information _POSIX_Spinlock_Information;
+typedef struct {
+#if defined(RTEMS_SMP)
+ SMP_ticket_lock_Control Lock;
+#else
+ unsigned int reserved[ 2 ];
+#endif
+ ISR_Level interrupt_state;
+} POSIX_Spinlock_Control;
-/**
- * @brief Allocate a spinlock control block.
- *
- * This function allocates a spinlock control block from
- * the inactive chain of free spinlock control blocks.
- */
-RTEMS_INLINE_ROUTINE POSIX_Spinlock_Control *_POSIX_Spinlock_Allocate( void )
-{
- return (POSIX_Spinlock_Control *)
- _Objects_Allocate( &_POSIX_Spinlock_Information );
-}
+#if !defined(POSIX_SPINLOCKS_ARE_SELF_CONTAINED)
+#if defined(RTEMS_SMP)
+extern POSIX_Spinlock_Control _POSIX_Spinlock_Global;
-/**
- * @brief Free a spinlock control block.
- *
- * This routine frees a spinlock control block to the
- * inactive chain of free spinlock control blocks.
- */
-RTEMS_INLINE_ROUTINE void _POSIX_Spinlock_Free (
- POSIX_Spinlock_Control *the_spinlock
-)
-{
- _Objects_Free( &_POSIX_Spinlock_Information, &the_spinlock->Object );
-}
+extern uint32_t _POSIX_Spinlock_Owner;
+#endif
+
+extern int _POSIX_Spinlock_Nest_level;
+#endif
RTEMS_INLINE_ROUTINE POSIX_Spinlock_Control *_POSIX_Spinlock_Get(
- pthread_spinlock_t *spinlock,
- ISR_lock_Context *lock_context
+ pthread_spinlock_t *lock
)
{
- if ( spinlock == NULL ) {
- return NULL;
- }
-
- return (POSIX_Spinlock_Control *) _Objects_Get(
- *spinlock,
- lock_context,
- &_POSIX_Spinlock_Information
- );
+#if defined(POSIX_SPINLOCKS_ARE_SELF_CONTAINED)
+ return (POSIX_Spinlock_Control *) lock;
+#elif defined(RTEMS_SMP)
+ (void) lock;
+ return &_POSIX_Spinlock_Global;
+#else
+ (void) lock;
+ return NULL;
+#endif
}
#ifdef __cplusplus