RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Fix plain priority thread queues (SMP)

Browse Source 
We must add/remove the priority queue to the FIFO of priority queues.
This commit is contained in:
Sebastian Huber
2019-02-07 07:46:38 +01:00
parent 0fb52cede1
commit fbd08066af
2 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/score/src/threadqops.c
View File

@@ -360,6 +360,10 @@ static void _Thread_queue_Priority_priority_actions(
switch ( priority_action_type ) { switch ( priority_action_type ) {
#if defined(RTEMS_SMP) #if defined(RTEMS_SMP)
case PRIORITY_ACTION_ADD: case PRIORITY_ACTION_ADD:
if ( _Priority_Is_empty( &priority_queue->Queue ) ) {
_Chain_Append_unprotected( &heads->Heads.Fifo, &priority_queue->Node );
}
_Priority_Plain_insert( _Priority_Plain_insert(
&priority_queue->Queue, &priority_queue->Queue,
&scheduler_node->Wait.Priority.Node, &scheduler_node->Wait.Priority.Node,
@@ -371,6 +375,10 @@ static void _Thread_queue_Priority_priority_actions(
&priority_queue->Queue, &priority_queue->Queue,
&scheduler_node->Wait.Priority.Node &scheduler_node->Wait.Priority.Node
); );
if ( _Priority_Is_empty( &priority_queue->Queue ) ) {
_Chain_Extract_unprotected( &priority_queue->Node );
}
break; break;
#endif #endif
default: default:

63
testsuites/smptests/smpmutex01/init.c
View File

@@ -687,6 +687,67 @@ static void test_mixed_queue_two_scheduler_instances_sem_only(test_context *ctx)
sem_release(ctx); sem_release(ctx);
} }
static void test_two_scheduler_instances_sem_with_inheritance(test_context *ctx)
{
sem_obtain(ctx);
request(ctx, B_4, REQ_MTX_OBTAIN);
check_generations(ctx, B_4, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, PRIO_NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
request(ctx, B_4, REQ_SEM_OBTAIN_RELEASE);
check_generations(ctx, NONE, NONE);
request(ctx, A_1, REQ_MTX_OBTAIN);
check_generations(ctx, NONE, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, 1);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
sem_release(ctx);
sync_with_helper(ctx);
check_generations(ctx, B_4, NONE);
request(ctx, B_4, REQ_MTX_RELEASE);
check_generations(ctx, B_4, A_1);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, PRIO_NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
request(ctx, A_1, REQ_MTX_RELEASE);
check_generations(ctx, A_1, NONE);
}
static void test_two_scheduler_instances_sem_with_inheritance_timeout(test_context *ctx)
{
sem_obtain(ctx);
request(ctx, B_4, REQ_MTX_OBTAIN);
check_generations(ctx, B_4, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, PRIO_NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
request(ctx, B_4, REQ_SEM_OBTAIN_RELEASE);
check_generations(ctx, NONE, NONE);
request(ctx, A_1, REQ_MTX_OBTAIN_TIMEOUT);
check_generations(ctx, NONE, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, 1);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
wait();
check_generations(ctx, A_1, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, PRIO_NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
sem_release(ctx);
sync_with_helper(ctx);
check_generations(ctx, B_4, NONE);
request(ctx, B_4, REQ_MTX_RELEASE);
check_generations(ctx, B_4, NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_A, PRIO_NONE);
assert_prio_by_scheduler(ctx, B_4, SCHED_B, 4);
}
static void test_simple_inheritance_two_scheduler_instances(test_context *ctx) static void test_simple_inheritance_two_scheduler_instances(test_context *ctx)
{ {
obtain(ctx); obtain(ctx);
@@ -1010,6 +1071,8 @@ static void test(test_context *ctx)
test_dequeue_order_one_scheduler_instance(ctx); test_dequeue_order_one_scheduler_instance(ctx);
test_mixed_queue_two_scheduler_instances(ctx); test_mixed_queue_two_scheduler_instances(ctx);
test_mixed_queue_two_scheduler_instances_sem_only(ctx); test_mixed_queue_two_scheduler_instances_sem_only(ctx);
test_two_scheduler_instances_sem_with_inheritance(ctx);
test_two_scheduler_instances_sem_with_inheritance_timeout(ctx);
test_simple_inheritance_two_scheduler_instances(ctx); test_simple_inheritance_two_scheduler_instances(ctx);
test_nested_inheritance_two_scheduler_instances(ctx); test_nested_inheritance_two_scheduler_instances(ctx);
test_dequeue_order_two_scheduler_instances(ctx); test_dequeue_order_two_scheduler_instances(ctx);