Changeset 1c2d178 in rtems for testsuites

Timestamp:

Nov 25, 2018, 7:15:26 PM (13 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

f70079c

Parents:

3899bc1a

git-author:

Sebastian Huber <sebastian.huber@…> (11/25/18 19:15:26)

git-committer:

Sebastian Huber <sebastian.huber@…> (12/07/18 13:22:02)

Message:

score: Remove Objects_Information::maximum

This information is already present in Objects_Information::maximum_id.
Add and use _Objects_Get_maximum_index().

Update #3621.

File:

• testsuites/sptests/spsysinit01/init.c (modified) (34 diffs)

testsuites/sptests/spsysinit01/init.c

@@ -249 +249 @@
 FIRST(RTEMS_SYSINIT_DATA_STRUCTURES)
 {
-  assert(_Thread_Internal_information.Objects.maximum == 0);
+  assert(
+    _Objects_Get_maximum_index(&_Thread_Internal_information.Objects) == 0
+  );
   next_step(DATA_STRUCTURES_PRE);
 }
@@ -255 +257 @@
 LAST(RTEMS_SYSINIT_DATA_STRUCTURES)
 {
-  assert(_Thread_Internal_information.Objects.maximum != 0);
+  assert(
+    _Objects_Get_maximum_index(&_Thread_Internal_information.Objects) != 0
+  );
   next_step(DATA_STRUCTURES_POST);
 }
@@ -261 +265 @@
 FIRST(RTEMS_SYSINIT_USER_EXTENSIONS)
 {
-  assert(_Extension_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Extension_Information) == 0);
   next_step(USER_EXTENSIONS_PRE);
 }
@@ -267 +271 @@
 LAST(RTEMS_SYSINIT_USER_EXTENSIONS)
 {
-  assert(_Extension_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Extension_Information) != 0);
   next_step(USER_EXTENSIONS_POST);
 }
@@ -273 +277 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_TASKS)
 {
-  assert(_RTEMS_tasks_Information.Objects.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_RTEMS_tasks_Information.Objects) == 0);
   next_step(CLASSIC_TASKS_PRE);
 }
@@ -279 +283 @@
 LAST(RTEMS_SYSINIT_CLASSIC_TASKS)
 {
-  assert(_RTEMS_tasks_Information.Objects.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_RTEMS_tasks_Information.Objects) != 0);
   next_step(CLASSIC_TASKS_POST);
 }
@@ -285 +289 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_TIMER)
 {
-  assert(_Timer_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Timer_Information) == 0);
   next_step(CLASSIC_TIMER_PRE);
 }
@@ -291 +295 @@
 LAST(RTEMS_SYSINIT_CLASSIC_TIMER)
 {
-  assert(_Timer_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Timer_Information) != 0);
   next_step(CLASSIC_TIMER_POST);
 }
@@ -319 +323 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_MESSAGE_QUEUE)
 {
-  assert(_Message_queue_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Message_queue_Information) == 0);
   next_step(CLASSIC_MESSAGE_QUEUE_PRE);
 }
@@ -325 +329 @@
 LAST(RTEMS_SYSINIT_CLASSIC_MESSAGE_QUEUE)
 {
-  assert(_Message_queue_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Message_queue_Information) != 0);
   next_step(CLASSIC_MESSAGE_QUEUE_POST);
 }
@@ -331 +335 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_SEMAPHORE)
 {
-  assert(_Semaphore_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Semaphore_Information) == 0);
   next_step(CLASSIC_SEMAPHORE_PRE);
 }
@@ -337 +341 @@
 LAST(RTEMS_SYSINIT_CLASSIC_SEMAPHORE)
 {
-  assert(_Semaphore_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Semaphore_Information) != 0);
   next_step(CLASSIC_SEMAPHORE_POST);
 }
@@ -343 +347 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_PARTITION)
 {
-  assert(_Partition_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Partition_Information) == 0);
   next_step(CLASSIC_PARTITION_PRE);
 }
@@ -349 +353 @@
 LAST(RTEMS_SYSINIT_CLASSIC_PARTITION)
 {
-  assert(_Partition_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Partition_Information) != 0);
   next_step(CLASSIC_PARTITION_POST);
 }
@@ -355 +359 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_REGION)
 {
-  assert(_Region_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Region_Information) == 0);
   next_step(CLASSIC_REGION_PRE);
 }
@@ -361 +365 @@
 LAST(RTEMS_SYSINIT_CLASSIC_REGION)
 {
-  assert(_Region_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Region_Information) != 0);
   next_step(CLASSIC_REGION_POST);
 }
@@ -367 +371 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_DUAL_PORTED_MEMORY)
 {
-  assert(_Dual_ported_memory_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Dual_ported_memory_Information) == 0);
   next_step(CLASSIC_DUAL_PORTED_MEMORY_PRE);
 }
@@ -373 +377 @@
 LAST(RTEMS_SYSINIT_CLASSIC_DUAL_PORTED_MEMORY)
 {
-  assert(_Dual_ported_memory_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Dual_ported_memory_Information) != 0);
   next_step(CLASSIC_DUAL_PORTED_MEMORY_POST);
 }
@@ -379 +383 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_RATE_MONOTONIC)
 {
-  assert(_Rate_monotonic_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Rate_monotonic_Information) == 0);
   next_step(CLASSIC_RATE_MONOTONIC_PRE);
 }
@@ -385 +389 @@
 LAST(RTEMS_SYSINIT_CLASSIC_RATE_MONOTONIC)
 {
-  assert(_Rate_monotonic_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Rate_monotonic_Information) != 0);
   next_step(CLASSIC_RATE_MONOTONIC_POST);
 }
@@ -391 +395 @@
 FIRST(RTEMS_SYSINIT_CLASSIC_BARRIER)
 {
-  assert(_Barrier_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_Barrier_Information) == 0);
   next_step(CLASSIC_BARRIER_PRE);
 }
@@ -397 +401 @@
 LAST(RTEMS_SYSINIT_CLASSIC_BARRIER)
 {
-  assert(_Barrier_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_Barrier_Information) != 0);
   next_step(CLASSIC_BARRIER_POST);
 }
@@ -429 +433 @@
 FIRST(RTEMS_SYSINIT_POSIX_THREADS)
 {
-  assert(_POSIX_Threads_Information.Objects.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Threads_Information.Objects) == 0);
   next_step(POSIX_THREADS_PRE);
 }
@@ -435 +439 @@
 LAST(RTEMS_SYSINIT_POSIX_THREADS)
 {
-  assert(_POSIX_Threads_Information.Objects.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Threads_Information.Objects) != 0);
   next_step(POSIX_THREADS_POST);
 }
@@ -441 +445 @@
 FIRST(RTEMS_SYSINIT_POSIX_MESSAGE_QUEUE)
 {
-  assert(_POSIX_Message_queue_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Message_queue_Information) == 0);
   next_step(POSIX_MESSAGE_QUEUE_PRE);
 }
@@ -447 +451 @@
 LAST(RTEMS_SYSINIT_POSIX_MESSAGE_QUEUE)
 {
-  assert(_POSIX_Message_queue_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Message_queue_Information) != 0);
   next_step(POSIX_MESSAGE_QUEUE_POST);
 }
@@ -453 +457 @@
 FIRST(RTEMS_SYSINIT_POSIX_SEMAPHORE)
 {
-  assert(_POSIX_Semaphore_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Semaphore_Information) == 0);
   next_step(POSIX_SEMAPHORE_PRE);
 }
@@ -459 +463 @@
 LAST(RTEMS_SYSINIT_POSIX_SEMAPHORE)
 {
-  assert(_POSIX_Semaphore_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Semaphore_Information) != 0);
   next_step(POSIX_SEMAPHORE_POST);
 }
@@ -466 +470 @@
 FIRST(RTEMS_SYSINIT_POSIX_TIMER)
 {
-  assert(_POSIX_Timer_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Timer_Information) == 0);
   next_step(POSIX_TIMER_PRE);
 }
@@ -472 +476 @@
 LAST(RTEMS_SYSINIT_POSIX_TIMER)
 {
-  assert(_POSIX_Timer_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Timer_Information) != 0);
   next_step(POSIX_TIMER_POST);
 }
@@ -479 +483 @@
 FIRST(RTEMS_SYSINIT_POSIX_SHM)
 {
-  assert(_POSIX_Shm_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Shm_Information) == 0);
   next_step(POSIX_SHM_PRE);
 }
@@ -485 +489 @@
 LAST(RTEMS_SYSINIT_POSIX_SHM)
 {
-  assert(_POSIX_Shm_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Shm_Information) != 0);
   next_step(POSIX_SHM_POST);
 }
@@ -509 +513 @@
 FIRST(RTEMS_SYSINIT_POSIX_KEYS)
 {
-  assert(_POSIX_Keys_Information.maximum == 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Keys_Information) == 0);
   next_step(POSIX_KEYS_PRE);
 }
@@ -515 +519 @@
 LAST(RTEMS_SYSINIT_POSIX_KEYS)
 {
-  assert(_POSIX_Keys_Information.maximum != 0);
+  assert(_Objects_Get_maximum_index(&_POSIX_Keys_Information) != 0);
   next_step(POSIX_KEYS_POST);
 }