[rtems-central commit] spec: Update due to API changes

Sebastian Huber sebh at rtems.org
Wed Aug 31 09:44:10 UTC 2022


Module:    rtems-central
Branch:    master
Commit:    fa36a75bec7f685bd84fdbca32ca250caa3bc4be
Changeset: http://git.rtems.org/rtems-central/commit/?id=fa36a75bec7f685bd84fdbca32ca250caa3bc4be

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Aug 31 07:37:16 2022 +0200

spec: Update due to API changes

---

 spec/newlib/req/futex-wake.yml               | 6 +++++-
 spec/rtems/sem/req/flush.yml                 | 6 +++++-
 spec/score/tq/req/flush-fifo.yml             | 4 ++--
 spec/score/tq/req/flush-priority-inherit.yml | 4 ++--
 spec/score/tq/req/flush-priority.yml         | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/spec/newlib/req/futex-wake.yml b/spec/newlib/req/futex-wake.yml
index e13c7c23..7a202d97 100644
--- a/spec/newlib/req/futex-wake.yml
+++ b/spec/newlib/req/futex-wake.yml
@@ -151,12 +151,14 @@ test-support: |
     return STATUS_BUILD( 0, eno );
   }
 
-  static void Flush( TQContext *tq_ctx )
+  static uint32_t Flush( TQContext *tq_ctx, uint32_t thread_count, bool all )
   {
     Context *ctx;
     int      count;
     int      how_many;
 
+    (void) all;
+
     ctx = ToContext( tq_ctx );
     how_many = (int) ctx->tq_ctx.how_many;
 
@@ -165,6 +167,8 @@ test-support: |
 
     count = _Futex_Wake( &ctx->futex, INT_MAX );
     T_eq_int( count, how_many > 1 ? how_many - 1 : 0 );
+
+    return thread_count;
   }
 test-target: testsuites/validation/tc-futex-wake.c
 test-teardown:
diff --git a/spec/rtems/sem/req/flush.yml b/spec/rtems/sem/req/flush.yml
index b2f49433..f49310cc 100644
--- a/spec/rtems/sem/req/flush.yml
+++ b/spec/rtems/sem/req/flush.yml
@@ -242,12 +242,16 @@ test-support: |
     return STATUS_BUILD( STATUS_SUCCESSFUL, 0 );
   }
 
-  static void Flush( TQContext *tq_ctx )
+  static uint32_t Flush( TQContext *tq_ctx, uint32_t thread_count, bool all )
   {
     rtems_status_code sc;
 
+    (void) all;
+
     sc = rtems_semaphore_flush( tq_ctx->thread_queue_id );
     T_rsc_success( sc );
+
+    return thread_count;
   }
 test-target: testsuites/validation/tc-sem-flush.c
 test-teardown:
diff --git a/spec/score/tq/req/flush-fifo.yml b/spec/score/tq/req/flush-fifo.yml
index 8c543ad7..a318d74f 100644
--- a/spec/score/tq/req/flush-fifo.yml
+++ b/spec/score/tq/req/flush-fifo.yml
@@ -75,7 +75,7 @@ test-action: |
     TQSend( ctx->tq_ctx, TQ_BLOCKER_D, TQ_EVENT_ENQUEUE );
   } else {
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH );
+    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH_ALL );
   }
 
   TQSchedulerRecordStop( ctx->tq_ctx );
@@ -137,7 +137,7 @@ test-support: |
 
     ctx = arg;
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQFlush( ctx->tq_ctx );
+    TQFlush( ctx->tq_ctx, true );
   }
 
   static void SchedulerEvent(
diff --git a/spec/score/tq/req/flush-priority-inherit.yml b/spec/score/tq/req/flush-priority-inherit.yml
index ad070b9f..3c8fe8cd 100644
--- a/spec/score/tq/req/flush-priority-inherit.yml
+++ b/spec/score/tq/req/flush-priority-inherit.yml
@@ -160,7 +160,7 @@ test-action: |
     );
   } else {
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH );
+    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH_ALL );
   }
 
   TQSchedulerRecordStop( ctx->tq_ctx );
@@ -234,7 +234,7 @@ test-support: |
 
     ctx = arg;
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQFlush( ctx->tq_ctx );
+    TQFlush( ctx->tq_ctx, true );
   }
 
   static void SchedulerEvent(
diff --git a/spec/score/tq/req/flush-priority.yml b/spec/score/tq/req/flush-priority.yml
index 7e5ac0c4..24e54496 100644
--- a/spec/score/tq/req/flush-priority.yml
+++ b/spec/score/tq/req/flush-priority.yml
@@ -81,7 +81,7 @@ test-action: |
     );
   } else {
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH );
+    TQSend( ctx->tq_ctx, TQ_BLOCKER_A, TQ_EVENT_FLUSH_ALL );
   }
 
   TQSchedulerRecordStop( ctx->tq_ctx );
@@ -158,7 +158,7 @@ test-support: |
 
     ctx = arg;
     TQSchedulerRecordStart( ctx->tq_ctx );
-    TQFlush( ctx->tq_ctx );
+    TQFlush( ctx->tq_ctx, true );
   }
 
   static void SchedulerEvent(



More information about the vc mailing list