Changeset 74a6b33f in rtems

Timestamp:

03/17/23 14:52:33 (3 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

ddafdfe

Parents:

3353d3f3

git-author:

Sebastian Huber <sebastian.huber@…> (03/17/23 14:52:33)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/17/23 14:55:39)

Message:

validation: Replace enum Event with defines

There is a Doxygen limitation that all compound names (enum, struct,
class, union, group) within a project must be unique.

Update #3716.

Location:

testsuites/validation

Files:

• tc-event-performance.c (modified) (1 diff)
• tc-message-performance.c (modified) (1 diff)
• tc-ratemon-timeout.c (modified) (1 diff)
• tc-sched-smp.c (modified) (1 diff)
• tc-scheduler-remove-processor.c (modified) (2 diffs)
• tc-score-smp-thread.c (modified) (1 diff)
• tc-score-thread-smp-one-cpu.c (modified) (1 diff)
• tc-sem-performance.c (modified) (1 diff)
• tc-task-performance.c (modified) (1 diff)

testsuites/validation/tc-event-performance.c

@@ -108 +108 @@
   RtemsEventValPerf_Instance;
 
+#define EVENT_END RTEMS_EVENT_0
+
+#define EVENT_OTHER RTEMS_EVENT_1
+
 typedef RtemsEventValPerf_Context Context;
-
-typedef enum {
-  EVENT_END = RTEMS_EVENT_0,
-  EVENT_OTHER = RTEMS_EVENT_1
-} Event;
 
 static void Send( const Context *ctx, rtems_event_set events )

testsuites/validation/tc-message-performance.c

@@ -122 +122 @@
 #define MAXIMUM_MESSAGE_SIZE 8
 
+#define EVENT_END RTEMS_EVENT_0
+
+#define EVENT_SEND RTEMS_EVENT_1
+
+#define EVENT_SEND_END RTEMS_EVENT_2
+
+#define EVENT_RECEIVE RTEMS_EVENT_3
+
+#define EVENT_RECEIVE_END RTEMS_EVENT_4
+
 typedef RtemsMessageValPerf_Context Context;
-
-typedef enum {
-  EVENT_END = RTEMS_EVENT_0,
-  EVENT_SEND = RTEMS_EVENT_1,
-  EVENT_SEND_END = RTEMS_EVENT_2,
-  EVENT_RECEIVE = RTEMS_EVENT_3,
-  EVENT_RECEIVE_END = RTEMS_EVENT_4
-} Event;
 
 static RTEMS_MESSAGE_QUEUE_BUFFER( MAXIMUM_MESSAGE_SIZE )

testsuites/validation/tc-ratemon-timeout.c

@@ -281 +281 @@
 };
 
+#define EVENT_RESET RTEMS_EVENT_0
+
+#define EVENT_PERIOD_WAIT RTEMS_EVENT_1
+
+#define EVENT_PERIOD_OTHER RTEMS_EVENT_2
+
 typedef RtemsRatemonReqTimeout_Context Context;
-
-typedef enum {
-  EVENT_RESET = RTEMS_EVENT_0,
-  EVENT_PERIOD_WAIT = RTEMS_EVENT_1,
-  EVENT_PERIOD_OTHER = RTEMS_EVENT_2
-} Event;
 
 static void Tick( void *arg )

testsuites/validation/tc-sched-smp.c

@@ -306 +306 @@
   ScoreSchedSmpValSmp_Instance;
 
+#define EVENT_OBTAIN RTEMS_EVENT_0
+
+#define EVENT_RELEASE RTEMS_EVENT_1
+
+#define EVENT_STICKY_OBTAIN RTEMS_EVENT_2
+
+#define EVENT_STICKY_RELEASE RTEMS_EVENT_3
+
+#define EVENT_SYNC_RUNNER RTEMS_EVENT_4
+
+#define EVENT_BUSY RTEMS_EVENT_5
+
 typedef ScoreSchedSmpValSmp_Context Context;
 
-typedef enum {
-  EVENT_OBTAIN = RTEMS_EVENT_0,
-  EVENT_RELEASE = RTEMS_EVENT_1,
-  EVENT_STICKY_OBTAIN = RTEMS_EVENT_2,
-  EVENT_STICKY_RELEASE = RTEMS_EVENT_3,
-  EVENT_SYNC_RUNNER = RTEMS_EVENT_4,
-  EVENT_BUSY = RTEMS_EVENT_5
-} Event;
-
-static void SendAndSync( Context *ctx, WorkerIndex worker, Event event )
+static void SendAndSync(
+  Context        *ctx,
+  WorkerIndex     worker,
+  rtems_event_set event
+)
 {
   SendEvents( ctx->worker_id[ worker ], EVENT_SYNC_RUNNER | event );

testsuites/validation/tc-scheduler-remove-processor.c

@@ -378 +378 @@
 
 #if defined(RTEMS_SMP)
-typedef enum {
-  EVENT_SYNC_RUNNER = RTEMS_EVENT_0,
-  EVENT_OBTAIN = RTEMS_EVENT_1,
-  EVENT_RELEASE = RTEMS_EVENT_2,
-  EVENT_STICKY_OBTAIN = RTEMS_EVENT_3,
-  EVENT_STICKY_RELEASE = RTEMS_EVENT_4,
-  EVENT_RESTART = RTEMS_EVENT_5,
-  EVENT_BUSY = RTEMS_EVENT_6,
-  EVENT_SYNC_RUNNER_LATE = RTEMS_EVENT_7
-} Event;
+
+#define EVENT_SYNC_RUNNER RTEMS_EVENT_0
+
+#define EVENT_OBTAIN RTEMS_EVENT_1
+
+#define EVENT_RELEASE RTEMS_EVENT_2
+
+#define EVENT_STICKY_OBTAIN RTEMS_EVENT_3
+
+#define EVENT_STICKY_RELEASE RTEMS_EVENT_4
+
+#define EVENT_RESTART RTEMS_EVENT_5
+
+#define EVENT_BUSY RTEMS_EVENT_6
+
+#define EVENT_SYNC_RUNNER_LATE RTEMS_EVENT_7
 
 static void Barriers( void *arg )
@@ -414 +420 @@
 }
 
-static void SendAndSync( Context *ctx, WorkerIndex worker, Event event )
+static void SendAndSync(
+  Context        *ctx,
+  WorkerIndex     worker,
+  rtems_event_set event
+)
 {
   SendEvents( ctx->worker_id[ worker ], EVENT_SYNC_RUNNER | event );

testsuites/validation/tc-score-smp-thread.c

@@ -160 +160 @@
   ScoreThreadValSmp_Instance;
 
+#define EVENT_OBTAIN RTEMS_EVENT_0
+
+#define EVENT_RELEASE RTEMS_EVENT_1
+
+#define EVENT_COUNT_EARLY RTEMS_EVENT_2
+
+#define EVENT_BUSY RTEMS_EVENT_3
+
+#define EVENT_COUNT RTEMS_EVENT_4
+
+#define EVENT_LET_WORKER_C_COUNT RTEMS_EVENT_5
+
+#define EVENT_SET_TASK_SWITCH_EXTENSION RTEMS_EVENT_6
+
 typedef ScoreThreadValSmp_Context Context;
-
-typedef enum {
-  EVENT_OBTAIN = RTEMS_EVENT_0,
-  EVENT_RELEASE = RTEMS_EVENT_1,
-  EVENT_COUNT_EARLY = RTEMS_EVENT_2,
-  EVENT_BUSY = RTEMS_EVENT_3,
-  EVENT_COUNT = RTEMS_EVENT_4,
-  EVENT_LET_WORKER_C_COUNT = RTEMS_EVENT_5,
-  EVENT_SET_TASK_SWITCH_EXTENSION = RTEMS_EVENT_6
-} Event;
 
 static void TaskSwitchExtension( rtems_tcb *executing, rtems_tcb *heir )

testsuites/validation/tc-score-thread-smp-one-cpu.c

@@ -98 +98 @@
   ScoreThreadValSmpOneCpu_Instance;
 
+#define EVENT_COUNT RTEMS_EVENT_0
+
 typedef ScoreThreadValSmpOneCpu_Context Context;
-
-typedef enum {
-  EVENT_COUNT = RTEMS_EVENT_0
-} Event;
 
 static void WorkerTask( rtems_task_argument arg )

testsuites/validation/tc-sem-performance.c

@@ -113 +113 @@
   RtemsSemValPerf_Instance;
 
+#define EVENT_END RTEMS_EVENT_0
+
+#define EVENT_OBTAIN RTEMS_EVENT_1
+
+#define EVENT_OBTAIN_END RTEMS_EVENT_2
+
+#define EVENT_RELEASE RTEMS_EVENT_3
+
+#define EVENT_RELEASE_END RTEMS_EVENT_4
+
 typedef RtemsSemValPerf_Context Context;
-
-typedef enum {
-  EVENT_END = RTEMS_EVENT_0,
-  EVENT_OBTAIN = RTEMS_EVENT_1,
-  EVENT_OBTAIN_END = RTEMS_EVENT_2,
-  EVENT_RELEASE = RTEMS_EVENT_3,
-  EVENT_RELEASE_END = RTEMS_EVENT_4
-} Event;
 
 static void Send( const Context *ctx, rtems_event_set events )

testsuites/validation/tc-task-performance.c

@@ -114 +114 @@
   RtemsTaskValPerf_Instance;
 
+#define EVENT_RESTART RTEMS_EVENT_0
+
+#define EVENT_SET_END RTEMS_EVENT_1
+
+#define EVENT_BUSY RTEMS_EVENT_2
+
 typedef RtemsTaskValPerf_Context Context;
-
-enum {
-  EVENT_RESTART = RTEMS_EVENT_0,
-  EVENT_SET_END = RTEMS_EVENT_1,
-  EVENT_BUSY = RTEMS_EVENT_2
-} Event;
 
 RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char task_storage[