record: Rename internal per-CPU events

Update #3665.

6 files changed, 27 insertions, 27 deletions

diff --git a/cpukit/include/rtems/recorddata.h b/cpukit/include/rtems/recorddata.h
index 56c7f1c479..f2d9ccef2d 100644
--- a/cpukit/include/rtems/recorddata.h
+++ b/cpukit/include/rtems/recorddata.h
@@ -53,7 +53,7 @@ extern "C" {
  * The record version reflects the record event definitions.  It is reported by
  * the RTEMS_RECORD_VERSION event.
  */
-#define RTEMS_RECORD_THE_VERSION 1
+#define RTEMS_RECORD_THE_VERSION 2
 
 /**
  * @brief The items are in 32-bit little-endian format.
@@ -100,7 +100,6 @@ typedef enum {
   RTEMS_RECORD_CHOWN,
   RTEMS_RECORD_CLOSE,
   RTEMS_RECORD_CONNECT,
-  RTEMS_RECORD_COUNT,
   RTEMS_RECORD_ETHER_INPUT,
   RTEMS_RECORD_ETHER_OUTPUT,
   RTEMS_RECORD_FCHMOD,
@@ -111,7 +110,6 @@ typedef enum {
   RTEMS_RECORD_FSYNC,
   RTEMS_RECORD_FTRUNCATE,
   RTEMS_RECORD_GIT_HASH,
-  RTEMS_RECORD_HEAD,
   RTEMS_RECORD_HEAP_ALLOC,
   RTEMS_RECORD_HEAP_FREE,
   RTEMS_RECORD_HEAP_SIZE,
@@ -134,9 +132,12 @@ typedef enum {
   RTEMS_RECORD_MMAP,
   RTEMS_RECORD_MOUNT,
   RTEMS_RECORD_OPEN,
-  RTEMS_RECORD_OVERFLOW,
   RTEMS_RECORD_PAGE_ALLOC,
   RTEMS_RECORD_PAGE_FREE,
+  RTEMS_RECORD_PER_CPU_COUNT,
+  RTEMS_RECORD_PER_CPU_HEAD,
+  RTEMS_RECORD_PER_CPU_OVERFLOW,
+  RTEMS_RECORD_PER_CPU_TAIL,
   RTEMS_RECORD_POLL,
   RTEMS_RECORD_PROCESSOR,
   RTEMS_RECORD_PROCESSOR_MAXIMUM,
@@ -190,7 +191,6 @@ typedef enum {
   RTEMS_RECORD_SOCKET,
   RTEMS_RECORD_STATVFS,
   RTEMS_RECORD_SYMLINK,
-  RTEMS_RECORD_TAIL,
   RTEMS_RECORD_TCP_INPUT,
   RTEMS_RECORD_TCP_OUTPUT,
   RTEMS_RECORD_THREAD_BEGIN,
diff --git a/cpukit/libtrace/record/record-client.c b/cpukit/libtrace/record/record-client.c
index 585aa3895d..306dd2c30b 100644
--- a/cpukit/libtrace/record/record-client.c
+++ b/cpukit/libtrace/record/record-client.c
@@ -104,7 +104,7 @@ static void check_overflow(
   call_handler(
     ctx,
     bt,
-    RTEMS_RECORD_OVERFLOW,
+    RTEMS_RECORD_PER_CPU_OVERFLOW,
     new_content - capacity
   );
 }
@@ -142,15 +142,15 @@ static rtems_record_client_status visit( rtems_record_client_context *ctx )
       per_cpu->uptime.bt += (int64_t) data << 32;
       time = 0;
       break;
-    case RTEMS_RECORD_TAIL:
+    case RTEMS_RECORD_PER_CPU_TAIL:
       per_cpu->tail[ per_cpu->index ] = (uint32_t) data;
       break;
-    case RTEMS_RECORD_HEAD:
+    case RTEMS_RECORD_PER_CPU_HEAD:
       per_cpu->head[ per_cpu->index ]= (uint32_t) data;
       per_cpu->index ^= 1;
       check_overflow( ctx, per_cpu, (uint32_t) data );
       break;
-    case RTEMS_RECORD_COUNT:
+    case RTEMS_RECORD_PER_CPU_COUNT:
       ctx->count = (uint32_t) data;
       break;
     case RTEMS_RECORD_FREQUENCY:
diff --git a/cpukit/libtrace/record/record-server.c b/cpukit/libtrace/record/record-server.c
index 3f34b5d075..da7cf358d3 100644
--- a/cpukit/libtrace/record/record-server.c
+++ b/cpukit/libtrace/record/record-server.c
@@ -149,7 +149,7 @@ void _Record_Stream_header_initialize( Record_Stream_header *header )
     RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PROCESSOR_MAXIMUM );
   header->Processor_maximum.data = rtems_get_processor_count() - 1;
 
-  header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_COUNT );
+  header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PER_CPU_COUNT );
   header->Count.data = _Record_Item_count;
 
   header->Frequency.event =
diff --git a/cpukit/libtrace/record/record-text.c b/cpukit/libtrace/record/record-text.c
index ede18063ca..8f97a930a7 100644
--- a/cpukit/libtrace/record/record-text.c
+++ b/cpukit/libtrace/record/record-text.c
@@ -47,7 +47,6 @@ static const char * const event_text[] = {
   [ RTEMS_RECORD_CHOWN ] = "CHOWN",
   [ RTEMS_RECORD_CLOSE ] = "CLOSE",
   [ RTEMS_RECORD_CONNECT ] = "CONNECT",
-  [ RTEMS_RECORD_COUNT ] = "COUNT",
   [ RTEMS_RECORD_ETHER_INPUT ] = "ETHER_INPUT",
   [ RTEMS_RECORD_ETHER_OUTPUT ] = "ETHER_OUTPUT",
   [ RTEMS_RECORD_FCHMOD ] = "FCHMOD",
@@ -58,7 +57,6 @@ static const char * const event_text[] = {
   [ RTEMS_RECORD_FSYNC ] = "FSYNC",
   [ RTEMS_RECORD_FTRUNCATE ] = "FTRUNCATE",
   [ RTEMS_RECORD_GIT_HASH ] = "GIT_HASH",
-  [ RTEMS_RECORD_HEAD ] = "HEAD",
   [ RTEMS_RECORD_HEAP_ALLOC ] = "HEAP_ALLOC",
   [ RTEMS_RECORD_HEAP_FREE ] = "HEAP_FREE",
   [ RTEMS_RECORD_HEAP_SIZE ] = "HEAP_SIZE",
@@ -81,9 +79,12 @@ static const char * const event_text[] = {
   [ RTEMS_RECORD_MMAP ] = "MMAP",
   [ RTEMS_RECORD_MOUNT ] = "MOUNT",
   [ RTEMS_RECORD_OPEN ] = "OPEN",
-  [ RTEMS_RECORD_OVERFLOW ] = "OVERFLOW",
   [ RTEMS_RECORD_PAGE_ALLOC ] = "PAGE_ALLOC",
   [ RTEMS_RECORD_PAGE_FREE ] = "PAGE_FREE",
+  [ RTEMS_RECORD_PER_CPU_COUNT ] = "PER_CPU_COUNT",
+  [ RTEMS_RECORD_PER_CPU_HEAD ] = "PER_CPU_HEAD",
+  [ RTEMS_RECORD_PER_CPU_OVERFLOW ] = "PER_CPU_OVERFLOW",
+  [ RTEMS_RECORD_PER_CPU_TAIL ] = "PER_CPU_TAIL",
   [ RTEMS_RECORD_POLL ] = "POLL",
   [ RTEMS_RECORD_PROCESSOR ] = "PROCESSOR",
   [ RTEMS_RECORD_PROCESSOR_MAXIMUM ] = "PROCESSOR_MAXIMUM",
@@ -137,7 +138,6 @@ static const char * const event_text[] = {
   [ RTEMS_RECORD_SOCKET ] = "SOCKET",
   [ RTEMS_RECORD_STATVFS ] = "STATVFS",
   [ RTEMS_RECORD_SYMLINK ] = "SYMLINK",
-  [ RTEMS_RECORD_TAIL ] = "TAIL",
   [ RTEMS_RECORD_TCP_INPUT ] = "TCP_INPUT",
   [ RTEMS_RECORD_TCP_OUTPUT ] = "TCP_OUTPUT",
   [ RTEMS_RECORD_THREAD_BEGIN ] = "THREAD_BEGIN",
diff --git a/cpukit/libtrace/record/record.c b/cpukit/libtrace/record/record.c
index f12e78dc9f..996b861cf6 100644
--- a/cpukit/libtrace/record/record.c
+++ b/cpukit/libtrace/record/record.c
@@ -115,9 +115,9 @@ void rtems_record_drain( rtems_record_drain_visitor visitor, void *arg )
 
     control->Header[ 0 ].event = RTEMS_RECORD_PROCESSOR;
     control->Header[ 0 ].data = cpu_index;
-    control->Header[ 1 ].event = RTEMS_RECORD_TAIL;
+    control->Header[ 1 ].event = RTEMS_RECORD_PER_CPU_TAIL;
     control->Header[ 1 ].data = tail;
-    control->Header[ 2 ].event = RTEMS_RECORD_HEAD;
+    control->Header[ 2 ].event = RTEMS_RECORD_PER_CPU_HEAD;
     control->Header[ 2 ].data = head;
     ( *visitor )( control->Header, RTEMS_ARRAY_SIZE( control->Header ), arg );
 
diff --git a/testsuites/libtests/record01/init.c b/testsuites/libtests/record01/init.c
index 604860de71..3a3680c292 100644
--- a/testsuites/libtests/record01/init.c
+++ b/testsuites/libtests/record01/init.c
@@ -111,8 +111,8 @@ static const rtems_record_item expected_items_7[ITEM_COUNT] = {
 
 static const rtems_record_item expected_items_8[] = {
   { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_TAIL), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_HEAD), .data = 3 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 0 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 3 },
   { .event = TE(2, UE(1)), .data = 3 },
   { .event = TE(5, UE(4)), .data = 6 },
   { .event = TE(8, UE(7)), .data = 9 }
@@ -120,16 +120,16 @@ static const rtems_record_item expected_items_8[] = {
 
 static const rtems_record_item expected_items_9[] = {
   { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_TAIL), .data = 3 },
-  { .event = TE(0, RTEMS_RECORD_HEAD), .data = 5 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 3 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 5 },
   { .event = TE(11, UE(10)), .data = 12 },
   { .event = TE(14, UE(13)), .data = 15 }
 };
 
 static const rtems_record_item expected_items_10[] = {
   { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_TAIL), .data = 5 },
-  { .event = TE(0, RTEMS_RECORD_HEAD), .data = 8 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 5 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 8 },
   { .event = TE(17, UE(16)), .data = 18 },
   { .event = TE(20, UE(19)), .data = 21 },
   { .event = TE(23, UE(22)), .data = 24 }
@@ -137,15 +137,15 @@ static const rtems_record_item expected_items_10[] = {
 
 static const rtems_record_item expected_items_11[] = {
   { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_TAIL), .data = 8 },
-  { .event = TE(0, RTEMS_RECORD_HEAD), .data = 9 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 8 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 9 },
   { .event = TE(26, UE(25)), .data = 27 }
 };
 
 static const rtems_record_item expected_items_12[] = {
   { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
-  { .event = TE(0, RTEMS_RECORD_TAIL), .data = 9 },
-  { .event = TE(0, RTEMS_RECORD_HEAD), .data = 15 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 9 },
+  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 15 },
   { .event = TE(38, UE(37)), .data = 39 },
   { .event = TE(41, UE(40)), .data = 42 },
   { .event = TE(44, UE(43)), .data = 45 }
@@ -552,7 +552,7 @@ static int connect_client(void)
 
   n = read(fd, &item, sizeof(item));
   rtems_test_assert(n == (ssize_t) sizeof(item));
-  rtems_test_assert(item.event == TE(0, RTEMS_RECORD_COUNT));
+  rtems_test_assert(item.event == TE(0, RTEMS_RECORD_PER_CPU_COUNT));
   rtems_test_assert(item.data == ITEM_COUNT);
 
   n = read(fd, &item, sizeof(item));