[rtems commit] _Scheduler_FIXME_thread_priority_queues_are_broken

Sebastian Huber sebh at rtems.org
Mon Nov 24 10:58:12 UTC 2014


Module:    rtems
Branch:    master
Commit:    26f4cddbd9146e8e0b849828f8ee76f5a78a118b
Changeset: http://git.rtems.org/rtems/commit/?id=26f4cddbd9146e8e0b849828f8ee76f5a78a118b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Nov 24 08:35:45 2014 +0100

_Scheduler_FIXME_thread_priority_queues_are_broken

Delete this variable since it is no longer necessary due to the thread
priority queue implementation change to use RB trees.

---

 cpukit/sapi/include/confdefs.h               | 6 ------
 cpukit/score/include/rtems/score/scheduler.h | 9 ---------
 cpukit/score/src/threadq.c                   | 4 ----
 3 files changed, 19 deletions(-)

diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 7e7c310..a30c008 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -966,12 +966,6 @@ const rtems_libio_helper rtems_fs_init_helper =
       _Scheduler_Assignments
     );
   #endif
-
-  #if defined(CONFIGURE_SCHEDULER_EDF)
-    const bool _Scheduler_FIXME_thread_priority_queues_are_broken = true;
-  #else
-    const bool _Scheduler_FIXME_thread_priority_queues_are_broken = false;
-  #endif
 #endif
 
 /*
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index 8da988f..8bace85 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -552,15 +552,6 @@ void _Scheduler_default_Start_idle(
   #define SCHEDULER_OPERATION_DEFAULT_GET_SET_AFFINITY
 #endif
 
-/**
- * @brief Indicates if thread priority queues are broken with the configured
- * scheduler or not.
- *
- * See also PR2174: Memory corruption with EDF scheduler and thread priority
- * queues.
- */
-extern const bool _Scheduler_FIXME_thread_priority_queues_are_broken;
-
 /**@}*/
 
 #ifdef __cplusplus
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index aa08541..1f416ba 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -51,10 +51,6 @@ void _Thread_queue_Initialize(
   uint32_t                      timeout_status
 )
 {
-  if ( _Scheduler_FIXME_thread_priority_queues_are_broken ) {
-    the_discipline = THREAD_QUEUE_DISCIPLINE_FIFO;
-  }
-
   the_thread_queue->state          = state;
   the_thread_queue->discipline     = the_discipline;
   the_thread_queue->timeout_status = timeout_status;




More information about the vc mailing list