diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-10-21 14:33:01 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-02 10:05:44 +0100 |
| commit | 9c238e1bd4bb8d3874bec65757db31d63db20d40 (patch) | |
| tree | afe70511271f2408ee487e1c5c6efcd1a51e0a4c /testsuites/smptests/smpscheduler03 | |
| parent | score: Delete _Scheduler_Ask_for_help_if_necessary (diff) | |
| download | rtems-9c238e1bd4bb8d3874bec65757db31d63db20d40.tar.bz2 | |
score: Simplify update priority scheduler op
Remove unused return status.
Diffstat (limited to 'testsuites/smptests/smpscheduler03')
| -rw-r--r-- | testsuites/smptests/smpscheduler03/init.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c index 0d7b88ca8c..d9e48629d0 100644 --- a/testsuites/smptests/smpscheduler03/init.c +++ b/testsuites/smptests/smpscheduler03/init.c @@ -199,7 +199,7 @@ static void test_change_priority(void) rtems_test_assert(sc == RTEMS_SUCCESSFUL); } -static Thread_Control *update_priority_op( +static void update_priority_op( Thread_Control *thread, Scheduler_SMP_Node *scheduler_node, Priority_Control new_priority, @@ -209,7 +209,6 @@ static Thread_Control *update_priority_op( const Scheduler_Control *scheduler; ISR_lock_Context state_lock_context; ISR_lock_Context scheduler_lock_context; - Thread_Control *needs_help; Thread_queue_Context queue_context; apply_priority(thread, new_priority, prepend_it, &queue_context); @@ -218,7 +217,7 @@ static Thread_Control *update_priority_op( scheduler = _Scheduler_Get( thread ); _Scheduler_Acquire_critical( scheduler, &scheduler_lock_context ); - needs_help = (*scheduler->Operations.update_priority)( + (*scheduler->Operations.update_priority)( scheduler, thread, &scheduler_node->Base @@ -226,8 +225,6 @@ static Thread_Control *update_priority_op( _Scheduler_Release_critical( scheduler, &scheduler_lock_context ); _Thread_State_release( thread, &state_lock_context ); - - return needs_help; } static void test_case_update_priority_op( @@ -240,7 +237,6 @@ static void test_case_update_priority_op( Scheduler_SMP_Node_state new_state ) { - Thread_Control *needs_help; Per_CPU_Control *cpu_self; cpu_self = _Thread_Dispatch_disable(); @@ -258,23 +254,21 @@ static void test_case_update_priority_op( } rtems_test_assert(executing_node->state == start_state); - needs_help = update_priority_op(executing, executing_node, prio, prepend_it); + update_priority_op(executing, executing_node, prio, prepend_it); rtems_test_assert(executing_node->state == new_state); if (start_state != new_state) { switch (start_state) { case SCHEDULER_SMP_NODE_SCHEDULED: - rtems_test_assert(needs_help == executing); + rtems_test_assert(cpu_self->heir == other); break; case SCHEDULER_SMP_NODE_READY: - rtems_test_assert(needs_help == other); + rtems_test_assert(cpu_self->heir == executing); break; default: rtems_test_assert(0); break; } - } else { - rtems_test_assert(needs_help == NULL); } change_priority(executing, 1, true); |