Changeset b4bdbcf in rtems

Timestamp:

05/15/14 07:41:20 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

c0bff5e

Parents:

6359b68

git-author:

Sebastian Huber <sebastian.huber@…> (05/15/14 07:41:20)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/15/14 10:18:49)

Message:

score: Make _Thread_queue_Requeue() static

This function is only used by _Thread_Change_priority(). Make it static
to avoid the function call overhead in the performance critical function
_Thread_Change_priority().

Location:

cpukit/score

Files:

• Makefile.am (modified) (1 diff)
• include/rtems/score/threadqimpl.h (modified) (1 diff)
• src/threadchangepriority.c (modified) (1 diff)
• src/threadqrequeue.c (deleted)

cpukit/score/Makefile.am

@@ -294 +294 @@
     src/threadqextractfifo.c src/threadqextractpriority.c \
     src/threadqextractwithproxy.c src/threadqfirst.c src/threadqfirstfifo.c \
-    src/threadqfirstpriority.c src/threadqflush.c src/threadqrequeue.c \
+    src/threadqfirstpriority.c src/threadqflush.c \
     src/threadqprocesstimeout.c src/threadqtimeout.c
 

cpukit/score/include/rtems/score/threadqimpl.h

@@ -112 +112 @@
 
 /**
- *  @brief Invoked when a thread changes priority and is blocked.
- *
- *  This routine is invoked when a thread changes priority and is
- *  blocked on a thread queue.  If the queue is priority ordered,
- *  the_thread is removed from the_thread_queue and reinserted using
- *  its new priority.  This method has no impact on the state of the_thread
- *  or of any timeouts associated with this blocking.
- *
- *  @param[in] the_thread_queue pointer to a threadq header
- *  @param[in] the_thread pointer to a thread control block
- */
-void _Thread_queue_Requeue(
-  Thread_queue_Control *the_thread_queue,
-  Thread_Control       *the_thread
-);
-
-/**
  *  @brief Extracts thread from thread queue.
  *

cpukit/score/src/threadchangepriority.c

@@ -23 +23 @@
 #include <rtems/score/schedulerimpl.h>
 #include <rtems/score/threadqimpl.h>
+
+/**
+ *  @brief Invoked when a thread changes priority and is blocked.
+ *
+ *  This routine is invoked when a thread changes priority and is
+ *  blocked on a thread queue.  If the queue is priority ordered,
+ *  the_thread is removed from the_thread_queue and reinserted using
+ *  its new priority.  This method has no impact on the state of the_thread
+ *  or of any timeouts associated with this blocking.
+ *
+ *  @param[in] the_thread_queue pointer to a threadq header
+ *  @param[in] the_thread pointer to a thread control block
+ */
+static void _Thread_queue_Requeue(
+  Thread_queue_Control *the_thread_queue,
+  Thread_Control       *the_thread
+)
+{
+  /*
+   * Just in case the thread really wasn't blocked on a thread queue
+   * when we get here.
+   */
+  if ( !the_thread_queue )
+    return;
+
+  /*
+   * If queueing by FIFO, there is nothing to do. This only applies to
+   * priority blocking discipline.
+   */
+  if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY ) {
+    Thread_queue_Control *tq = the_thread_queue;
+    ISR_Level             level;
+    ISR_Level             level_ignored;
+
+    _ISR_Disable( level );
+    if ( _States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
+      _Thread_queue_Enter_critical_section( tq );
+      _Thread_queue_Extract_priority_helper(
+        the_thread,
+        the_thread->Wait.return_code,
+        true
+      );
+      (void) _Thread_queue_Enqueue_priority( tq, the_thread, &level_ignored );
+    }
+    _ISR_Enable( level );
+  }
+}
 
 void _Thread_Change_priority(