Add _Thread_queue_Is_lock_owner() in case RTEMS_DEBUG is defined.
---
cpukit/score/include/rtems/score/threadq.h | 16 ++++++++-
cpukit/score/include/rtems/score/threadqimpl.h | 48 ++++++++++++++++++++++++--
2 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/cpukit/score/include/rtems/score/threadq.h
b/cpukit/score/include/rtems/score/threadq.h
index 4fddb25..dedeb8d 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/score/include/rtems/score/threadq.h
@@ -269,7 +269,20 @@ typedef struct {
* waiting to acquire a resource.
*/
typedef struct {
-#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
+#if defined(RTEMS_SMP)
+#if defined(RTEMS_DEBUG)
+ /**
+ * @brief The index of the owning processor of the thread queue lock.
+ *
+ * The thread queue lock may be acquired via the thread wait information
+ * inner lock also. This path is not covered by this field. In case the
+ * lock is not owned directly via _Thread_queue_Acquire(), then the value of
+ * this field is SMP_LOCK_NO_OWNER.
+ */
+ uint32_t owner;
+#endif
+
+#if defined(RTEMS_PROFILING)
/**
* @brief SMP lock statistics in case SMP and profiling are enabled.
*
@@ -278,6 +291,7 @@ typedef struct {
*/
SMP_lock_Stats Lock_stats;
#endif
+#endif
/**
* @brief The actual thread queue.
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h
b/cpukit/score/include/rtems/score/threadqimpl.h
index 0247842..e6cd401 100644
--- a/cpukit/score/include/rtems/score/threadqimpl.h
+++ b/cpukit/score/include/rtems/score/threadqimpl.h
@@ -23,6 +23,7 @@
#include <rtems/score/chainimpl.h>
#include <rtems/score/rbtreeimpl.h>
#include <rtems/score/scheduler.h>
+#include <rtems/score/smp.h>
#include <rtems/score/thread.h>
#ifdef __cplusplus
@@ -131,6 +132,9 @@ RTEMS_INLINE_ROUTINE void _Thread_queue_Acquire_critical(
&the_thread_queue->Lock_stats,
lock_context
);
+#if defined(RTEMS_DEBUG) && defined(RTEMS_SMP)
+ the_thread_queue->owner = _SMP_Get_current_processor();
+#endif
}
RTEMS_INLINE_ROUTINE void _Thread_queue_Acquire(
@@ -142,11 +146,30 @@ RTEMS_INLINE_ROUTINE void _Thread_queue_Acquire(
_Thread_queue_Acquire_critical( the_thread_queue, lock_context );
}
+#if defined(RTEMS_DEBUG)
+RTEMS_INLINE_ROUTINE bool _Thread_queue_Is_lock_owner(
+ const Thread_queue_Control *the_thread_queue
+)
+{
+#if defined(RTEMS_SMP)
+ return the_thread_queue->owner == _SMP_Get_current_processor();
+#else
+ return _ISR_Get_level() != 0;
+#endif
+}
+#endif
+
RTEMS_INLINE_ROUTINE void _Thread_queue_Release(
Thread_queue_Control *the_thread_queue,
ISR_lock_Context *lock_context
)
{
+#if defined(RTEMS_DEBUG)
+ _Assert( _Thread_queue_Is_lock_owner( the_thread_queue ) );
+#if defined(RTEMS_SMP)
+ the_thread_queue->owner = SMP_LOCK_NO_OWNER;
+#endif
+#endif
_Thread_queue_Queue_release(
&the_thread_queue->Queue,
lock_context
@@ -707,14 +730,33 @@ size_t _Thread_queue_Do_flush_critical(
void _Thread_queue_Initialize( Thread_queue_Control *the_thread_queue );
-#if defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
+#if defined(RTEMS_SMP) && defined(RTEMS_DEBUG) && defined(RTEMS_PROFILING)
+ #define THREAD_QUEUE_INITIALIZER( name ) \
+ { \
+ .Lock_stats = SMP_LOCK_STATS_INITIALIZER( name ), \
+ .owner = SMP_LOCK_NO_OWNER, \
+ .Queue = { \
+ .heads = NULL, \
+ .Lock = SMP_TICKET_LOCK_INITIALIZER, \
+ } \
+ }
+#elif defined(RTEMS_SMP) && defined(RTEMS_DEBUG)
+ #define THREAD_QUEUE_INITIALIZER( name ) \
+ { \
+ .owner = SMP_LOCK_NO_OWNER, \
+ .Queue = { \
+ .heads = NULL, \
+ .Lock = SMP_TICKET_LOCK_INITIALIZER, \
+ } \
+ }
+#elif defined(RTEMS_SMP) && defined(RTEMS_PROFILING)
#define THREAD_QUEUE_INITIALIZER( name ) \
{ \
+ .Lock_stats = SMP_LOCK_STATS_INITIALIZER( name ), \
.Queue = { \
.heads = NULL, \
.Lock = SMP_TICKET_LOCK_INITIALIZER, \
- }, \
- .Lock_stats = SMP_LOCK_STATS_INITIALIZER( name ) \
+ } \
}
#elif defined(RTEMS_SMP)
#define THREAD_QUEUE_INITIALIZER( name ) \
--
1.8.4.5
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
