summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/schedulerprioritysmp.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-11-09 16:21:37 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-11-20 08:36:49 +0100
commitc597fb166e05d315ce5da29c0a43a09992772dad (patch)
tree627d3f248020e0a292fe7dcb2505cf4d90957ae7 /cpukit/score/src/schedulerprioritysmp.c
parentbsps/powerpc: Fix PPC_EXC_CONFIG_USE_FIXED_HANDLER (diff)
downloadrtems-c597fb166e05d315ce5da29c0a43a09992772dad.tar.bz2
score: Optimize scheduler priority updates
Thread priority changes may append or prepend the thread to its priority group on the scheduler ready queue. Previously, a separate priority value and a prepend-it flag in the scheduler node were used to propagate a priority change to the scheduler. Now, use an append-it bit in the priority control and reduce the plain priority value to 63 bits. This change leads to a significant code size reduction (about 25%) of the SMP schedulers. The negligible increase of the standard priority scheduler is due to some additional shift operations (SCHEDULER_PRIORITY_MAP() and SCHEDULER_PRIORITY_UNMAP()). Before: text filename 136 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleblock.o 464 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimplechangepriority.o 24 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimple.o 108 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleschedule.o 292 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleunblock.o 264 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleyield.o text filename 280 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityblock.o 488 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerprioritychangepriority.o 200 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriority.o 164 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityschedule.o 328 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityunblock.o 200 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityyield.o text filename 24112 arm-rtems5/c/imx7/cpukit/score/src/libscore_a-scheduleredfsmp.o text filename 37204 sparc-rtems5/c/gr740/cpukit/score/src/libscore_a-scheduleredfsmp.o text filename 42236 powerpc-rtems5/c/qoriq_e6500_32/cpukit/score/src/libscore_a-scheduleredfsmp.o After: text filename 136 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleblock.o 272 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimplechangepriority.o 24 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimple.o 108 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleschedule.o 292 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleunblock.o 264 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulersimpleyield.o text filename 280 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityblock.o 488 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerprioritychangepriority.o 208 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriority.o 164 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityschedule.o 332 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityunblock.o 200 sparc-rtems5/c/erc32/cpukit/score/src/libscore_a-schedulerpriorityyield.o text filename 18860 arm-rtems5/c/imx7/cpukit/score/src/libscore_a-scheduleredfsmp.o text filename 28520 sparc-rtems5/c/gr740/cpukit/score/src/libscore_a-scheduleredfsmp.o text filename 32664 powerpc-rtems5/c/qoriq_e6500_32/cpukit/score/src/libscore_a-scheduleredfsmp.o
Diffstat (limited to 'cpukit/score/src/schedulerprioritysmp.c')
-rw-r--r--cpukit/score/src/schedulerprioritysmp.c116
1 files changed, 28 insertions, 88 deletions
diff --git a/cpukit/score/src/schedulerprioritysmp.c b/cpukit/score/src/schedulerprioritysmp.c
index 071a4218f3..205d3257ca 100644
--- a/cpukit/score/src/schedulerprioritysmp.c
+++ b/cpukit/score/src/schedulerprioritysmp.c
@@ -68,7 +68,7 @@ void _Scheduler_priority_SMP_Node_initialize(
self = _Scheduler_priority_SMP_Get_self( context );
_Scheduler_priority_Ready_queue_update(
&the_node->Ready_queue,
- priority,
+ SCHEDULER_PRIORITY_UNMAP( priority ),
&self->Bit_map,
&self->Ready[ 0 ]
);
@@ -109,103 +109,45 @@ void _Scheduler_priority_SMP_Block(
);
}
-static bool _Scheduler_priority_SMP_Enqueue_ordered(
- Scheduler_Context *context,
- Scheduler_Node *node,
- Chain_Node_order order,
- Scheduler_SMP_Insert insert_ready,
- Scheduler_SMP_Insert insert_scheduled
+static bool _Scheduler_priority_SMP_Enqueue(
+ Scheduler_Context *context,
+ Scheduler_Node *node,
+ Priority_Control insert_priority
)
{
- return _Scheduler_SMP_Enqueue_ordered(
+ return _Scheduler_SMP_Enqueue(
context,
node,
- order,
- insert_ready,
- insert_scheduled,
+ insert_priority,
+ _Scheduler_SMP_Priority_less_equal,
+ _Scheduler_priority_SMP_Insert_ready,
+ _Scheduler_SMP_Insert_scheduled,
_Scheduler_priority_SMP_Move_from_scheduled_to_ready,
_Scheduler_SMP_Get_lowest_scheduled,
_Scheduler_SMP_Allocate_processor_lazy
);
}
-static bool _Scheduler_priority_SMP_Enqueue_lifo(
- Scheduler_Context *context,
- Scheduler_Node *node
-)
-{
- return _Scheduler_priority_SMP_Enqueue_ordered(
- context,
- node,
- _Scheduler_SMP_Insert_priority_lifo_order,
- _Scheduler_priority_SMP_Insert_ready_lifo,
- _Scheduler_SMP_Insert_scheduled_lifo
- );
-}
-
-static bool _Scheduler_priority_SMP_Enqueue_fifo(
+static bool _Scheduler_priority_SMP_Enqueue_scheduled(
Scheduler_Context *context,
- Scheduler_Node *node
+ Scheduler_Node *node,
+ Priority_Control insert_priority
)
{
- return _Scheduler_priority_SMP_Enqueue_ordered(
+ return _Scheduler_SMP_Enqueue_scheduled(
context,
node,
- _Scheduler_SMP_Insert_priority_fifo_order,
- _Scheduler_priority_SMP_Insert_ready_fifo,
- _Scheduler_SMP_Insert_scheduled_fifo
- );
-}
-
-static bool _Scheduler_priority_SMP_Enqueue_scheduled_ordered(
- Scheduler_Context *context,
- Scheduler_Node *node,
- Chain_Node_order order,
- Scheduler_SMP_Insert insert_ready,
- Scheduler_SMP_Insert insert_scheduled
-)
-{
- return _Scheduler_SMP_Enqueue_scheduled_ordered(
- context,
- node,
- order,
+ insert_priority,
+ _Scheduler_SMP_Priority_less_equal,
_Scheduler_priority_SMP_Extract_from_ready,
_Scheduler_priority_SMP_Get_highest_ready,
- insert_ready,
- insert_scheduled,
+ _Scheduler_priority_SMP_Insert_ready,
+ _Scheduler_SMP_Insert_scheduled,
_Scheduler_priority_SMP_Move_from_ready_to_scheduled,
_Scheduler_SMP_Allocate_processor_lazy
);
}
-static bool _Scheduler_priority_SMP_Enqueue_scheduled_lifo(
- Scheduler_Context *context,
- Scheduler_Node *node
-)
-{
- return _Scheduler_priority_SMP_Enqueue_scheduled_ordered(
- context,
- node,
- _Scheduler_SMP_Insert_priority_lifo_order,
- _Scheduler_priority_SMP_Insert_ready_lifo,
- _Scheduler_SMP_Insert_scheduled_lifo
- );
-}
-
-static bool _Scheduler_priority_SMP_Enqueue_scheduled_fifo(
- Scheduler_Context *context,
- Scheduler_Node *node
-)
-{
- return _Scheduler_priority_SMP_Enqueue_scheduled_ordered(
- context,
- node,
- _Scheduler_SMP_Insert_priority_fifo_order,
- _Scheduler_priority_SMP_Insert_ready_fifo,
- _Scheduler_SMP_Insert_scheduled_fifo
- );
-}
-
void _Scheduler_priority_SMP_Unblock(
const Scheduler_Control *scheduler,
Thread_Control *thread,
@@ -219,7 +161,7 @@ void _Scheduler_priority_SMP_Unblock(
thread,
node,
_Scheduler_priority_SMP_Do_update,
- _Scheduler_priority_SMP_Enqueue_fifo
+ _Scheduler_priority_SMP_Enqueue
);
}
@@ -233,9 +175,9 @@ static bool _Scheduler_priority_SMP_Do_ask_for_help(
context,
the_thread,
node,
- _Scheduler_SMP_Insert_priority_lifo_order,
- _Scheduler_priority_SMP_Insert_ready_lifo,
- _Scheduler_SMP_Insert_scheduled_lifo,
+ _Scheduler_SMP_Priority_less_equal,
+ _Scheduler_priority_SMP_Insert_ready,
+ _Scheduler_SMP_Insert_scheduled,
_Scheduler_priority_SMP_Move_from_scheduled_to_ready,
_Scheduler_SMP_Get_lowest_scheduled,
_Scheduler_SMP_Allocate_processor_lazy
@@ -256,10 +198,8 @@ void _Scheduler_priority_SMP_Update_priority(
node,
_Scheduler_priority_SMP_Extract_from_ready,
_Scheduler_priority_SMP_Do_update,
- _Scheduler_priority_SMP_Enqueue_fifo,
- _Scheduler_priority_SMP_Enqueue_lifo,
- _Scheduler_priority_SMP_Enqueue_scheduled_fifo,
- _Scheduler_priority_SMP_Enqueue_scheduled_lifo,
+ _Scheduler_priority_SMP_Enqueue,
+ _Scheduler_priority_SMP_Enqueue_scheduled,
_Scheduler_priority_SMP_Do_ask_for_help
);
}
@@ -323,7 +263,7 @@ void _Scheduler_priority_SMP_Add_processor(
context,
idle,
_Scheduler_priority_SMP_Has_ready,
- _Scheduler_priority_SMP_Enqueue_scheduled_fifo,
+ _Scheduler_priority_SMP_Enqueue_scheduled,
_Scheduler_SMP_Do_nothing_register_idle
);
}
@@ -339,7 +279,7 @@ Thread_Control *_Scheduler_priority_SMP_Remove_processor(
context,
cpu,
_Scheduler_priority_SMP_Extract_from_ready,
- _Scheduler_priority_SMP_Enqueue_fifo
+ _Scheduler_priority_SMP_Enqueue
);
}
@@ -356,7 +296,7 @@ void _Scheduler_priority_SMP_Yield(
thread,
node,
_Scheduler_priority_SMP_Extract_from_ready,
- _Scheduler_priority_SMP_Enqueue_fifo,
- _Scheduler_priority_SMP_Enqueue_scheduled_fifo
+ _Scheduler_priority_SMP_Enqueue,
+ _Scheduler_priority_SMP_Enqueue_scheduled
);
}