From 2b72162b81b33a9f5983feccadd8426a1ab6f950 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 12 Jan 2017 10:15:56 +0100 Subject: score: Add Thread_queue_Queue::name Update #2858. --- cpukit/score/include/rtems/score/threadqimpl.h | 38 ++++++++++++++++++-------- 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'cpukit/score/include/rtems/score/threadqimpl.h') diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/cpukit/score/include/rtems/score/threadqimpl.h index 1558489fca..25a3f2d9f1 100644 --- a/cpukit/score/include/rtems/score/threadqimpl.h +++ b/cpukit/score/include/rtems/score/threadqimpl.h @@ -1014,44 +1014,58 @@ size_t _Thread_queue_Flush_critical( void _Thread_queue_Initialize( Thread_queue_Control *the_thread_queue ); #if defined(RTEMS_SMP) && defined(RTEMS_DEBUG) && defined(RTEMS_PROFILING) - #define THREAD_QUEUE_INITIALIZER( name ) \ + #define THREAD_QUEUE_INITIALIZER( _name ) \ { \ - .Lock_stats = SMP_LOCK_STATS_INITIALIZER( name ), \ + .Lock_stats = SMP_LOCK_STATS_INITIALIZER( _name ), \ .owner = SMP_LOCK_NO_OWNER, \ .Queue = { \ - .heads = NULL, \ .Lock = SMP_TICKET_LOCK_INITIALIZER, \ + .heads = NULL, \ + .owner = NULL, \ + .name = _name \ } \ } #elif defined(RTEMS_SMP) && defined(RTEMS_DEBUG) - #define THREAD_QUEUE_INITIALIZER( name ) \ + #define THREAD_QUEUE_INITIALIZER( _name ) \ { \ .owner = SMP_LOCK_NO_OWNER, \ .Queue = { \ - .heads = NULL, \ .Lock = SMP_TICKET_LOCK_INITIALIZER, \ + .heads = NULL, \ + .owner = NULL, \ + .name = _name \ } \ } #elif defined(RTEMS_SMP) && defined(RTEMS_PROFILING) - #define THREAD_QUEUE_INITIALIZER( name ) \ + #define THREAD_QUEUE_INITIALIZER( _name ) \ { \ - .Lock_stats = SMP_LOCK_STATS_INITIALIZER( name ), \ + .Lock_stats = SMP_LOCK_STATS_INITIALIZER( _name ), \ .Queue = { \ - .heads = NULL, \ .Lock = SMP_TICKET_LOCK_INITIALIZER, \ + .heads = NULL, \ + .owner = NULL, \ + .name = _name \ } \ } #elif defined(RTEMS_SMP) - #define THREAD_QUEUE_INITIALIZER( name ) \ + #define THREAD_QUEUE_INITIALIZER( _name ) \ { \ .Queue = { \ - .heads = NULL, \ .Lock = SMP_TICKET_LOCK_INITIALIZER, \ + .heads = NULL, \ + .owner = NULL, \ + .name = _name \ } \ } #else - #define THREAD_QUEUE_INITIALIZER( name ) \ - { .Queue = { .heads = NULL } } + #define THREAD_QUEUE_INITIALIZER( _name ) \ + { \ + .Queue = { \ + .heads = NULL, \ + .owner = NULL, \ + .name = _name \ + } \ + } #endif RTEMS_INLINE_ROUTINE void _Thread_queue_Destroy( -- cgit v1.2.3