Changeset f4d1f30 in rtems

Timestamp:

06/22/16 15:09:56 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

ac8402dd

Parents:

0b836337

git-author:

Sebastian Huber <sebastian.huber@…> (06/22/16 15:09:56)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/27/16 08:55:30)

Message:

score: Split _Thread_Change_priority()

Update #2412.
Update #2556.
Update #2765.

Location:

cpukit/score

Files:

• include/rtems/score/threadimpl.h (modified) (1 diff)
• src/threadchangepriority.c (modified) (3 diffs)

cpukit/score/include/rtems/score/threadimpl.h

@@ -460 +460 @@
   void             *arg
 );
+
+Thread_Control *_Thread_Apply_priority(
+  Thread_Control                *the_thread,
+  Priority_Control               new_priority,
+  void                          *arg,
+  Thread_Change_priority_filter  filter,
+  bool                           prepend_it
+);
+
+void _Thread_Update_priority( Thread_Control *the_thread );
 
 /**

cpukit/score/src/threadchangepriority.c

@@ -23 +23 @@
 #include <rtems/score/schedulerimpl.h>
 
-void _Thread_Change_priority(
+static Thread_Control *_Thread_Apply_priority_locked(
   Thread_Control                *the_thread,
   Priority_Control               new_priority,
@@ -31 +31 @@
 )
 {
-  ISR_lock_Context  lock_context;
-  ISR_lock_Control *lock;
-
-  lock = _Thread_Lock_acquire( the_thread, &lock_context );
-
   /*
    * For simplicity set the priority restore hint unconditionally since this is
@@ -63 +58 @@
       the_thread->Wait.queue
     );
-
-    _Thread_Lock_release( lock, &lock_context );
+  } else {
+    the_thread = NULL;
+  }
+
+  return the_thread;
+}
+
+Thread_Control *_Thread_Apply_priority(
+  Thread_Control                *the_thread,
+  Priority_Control               new_priority,
+  void                          *arg,
+  Thread_Change_priority_filter  filter,
+  bool                           prepend_it
+)
+{
+  ISR_lock_Context  lock_context;
+  ISR_lock_Control *lock;
+
+  lock = _Thread_Lock_acquire( the_thread, &lock_context );
+  the_thread = _Thread_Apply_priority_locked(
+    the_thread,
+    new_priority,
+    arg,
+    filter,
+    prepend_it
+  );
+  _Thread_Lock_release( lock, &lock_context );
+  return the_thread;
+}
+
+void _Thread_Update_priority( Thread_Control *the_thread )
+{
+  if ( the_thread != NULL ) {
+    ISR_lock_Context lock_context;
 
     _Thread_State_acquire( the_thread, &lock_context );
     _Scheduler_Update_priority( the_thread );
     _Thread_State_release( the_thread, &lock_context );
-  } else {
-    _Thread_Lock_release( lock, &lock_context );
   }
+}
+
+void _Thread_Change_priority(
+  Thread_Control                *the_thread,
+  Priority_Control               new_priority,
+  void                          *arg,
+  Thread_Change_priority_filter  filter,
+  bool                           prepend_it
+)
+{
+  the_thread = _Thread_Apply_priority(
+    the_thread,
+    new_priority,
+    arg,
+    filter,
+    prepend_it
+  );
+  _Thread_Update_priority( the_thread );
 }