Changeset d91951fb in rtems


Ignore:
Timestamp:
Mar 12, 2019, 7:15:19 AM (6 weeks ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
ebb8c28e
Parents:
0a154d5
git-author:
Sebastian Huber <sebastian.huber@…> (03/12/19 07:15:19)
git-committer:
Sebastian Huber <sebastian.huber@…> (03/12/19 12:44:24)
Message:

record: Rename internal per-CPU events

Update #3665.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/include/rtems/recorddata.h

    r0a154d5 rd91951fb  
    5454 * the RTEMS_RECORD_VERSION event.
    5555 */
    56 #define RTEMS_RECORD_THE_VERSION 1
     56#define RTEMS_RECORD_THE_VERSION 2
    5757
    5858/**
     
    101101  RTEMS_RECORD_CLOSE,
    102102  RTEMS_RECORD_CONNECT,
    103   RTEMS_RECORD_COUNT,
    104103  RTEMS_RECORD_ETHER_INPUT,
    105104  RTEMS_RECORD_ETHER_OUTPUT,
     
    112111  RTEMS_RECORD_FTRUNCATE,
    113112  RTEMS_RECORD_GIT_HASH,
    114   RTEMS_RECORD_HEAD,
    115113  RTEMS_RECORD_HEAP_ALLOC,
    116114  RTEMS_RECORD_HEAP_FREE,
     
    135133  RTEMS_RECORD_MOUNT,
    136134  RTEMS_RECORD_OPEN,
    137   RTEMS_RECORD_OVERFLOW,
    138135  RTEMS_RECORD_PAGE_ALLOC,
    139136  RTEMS_RECORD_PAGE_FREE,
     137  RTEMS_RECORD_PER_CPU_COUNT,
     138  RTEMS_RECORD_PER_CPU_HEAD,
     139  RTEMS_RECORD_PER_CPU_OVERFLOW,
     140  RTEMS_RECORD_PER_CPU_TAIL,
    140141  RTEMS_RECORD_POLL,
    141142  RTEMS_RECORD_PROCESSOR,
     
    191192  RTEMS_RECORD_STATVFS,
    192193  RTEMS_RECORD_SYMLINK,
    193   RTEMS_RECORD_TAIL,
    194194  RTEMS_RECORD_TCP_INPUT,
    195195  RTEMS_RECORD_TCP_OUTPUT,
  • cpukit/libtrace/record/record-client.c

    r0a154d5 rd91951fb  
    105105    ctx,
    106106    bt,
    107     RTEMS_RECORD_OVERFLOW,
     107    RTEMS_RECORD_PER_CPU_OVERFLOW,
    108108    new_content - capacity
    109109  );
     
    143143      time = 0;
    144144      break;
    145     case RTEMS_RECORD_TAIL:
     145    case RTEMS_RECORD_PER_CPU_TAIL:
    146146      per_cpu->tail[ per_cpu->index ] = (uint32_t) data;
    147147      break;
    148     case RTEMS_RECORD_HEAD:
     148    case RTEMS_RECORD_PER_CPU_HEAD:
    149149      per_cpu->head[ per_cpu->index ]= (uint32_t) data;
    150150      per_cpu->index ^= 1;
    151151      check_overflow( ctx, per_cpu, (uint32_t) data );
    152152      break;
    153     case RTEMS_RECORD_COUNT:
     153    case RTEMS_RECORD_PER_CPU_COUNT:
    154154      ctx->count = (uint32_t) data;
    155155      break;
  • cpukit/libtrace/record/record-server.c

    r0a154d5 rd91951fb  
    150150  header->Processor_maximum.data = rtems_get_processor_count() - 1;
    151151
    152   header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_COUNT );
     152  header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PER_CPU_COUNT );
    153153  header->Count.data = _Record_Item_count;
    154154
  • cpukit/libtrace/record/record-text.c

    r0a154d5 rd91951fb  
    4848  [ RTEMS_RECORD_CLOSE ] = "CLOSE",
    4949  [ RTEMS_RECORD_CONNECT ] = "CONNECT",
    50   [ RTEMS_RECORD_COUNT ] = "COUNT",
    5150  [ RTEMS_RECORD_ETHER_INPUT ] = "ETHER_INPUT",
    5251  [ RTEMS_RECORD_ETHER_OUTPUT ] = "ETHER_OUTPUT",
     
    5958  [ RTEMS_RECORD_FTRUNCATE ] = "FTRUNCATE",
    6059  [ RTEMS_RECORD_GIT_HASH ] = "GIT_HASH",
    61   [ RTEMS_RECORD_HEAD ] = "HEAD",
    6260  [ RTEMS_RECORD_HEAP_ALLOC ] = "HEAP_ALLOC",
    6361  [ RTEMS_RECORD_HEAP_FREE ] = "HEAP_FREE",
     
    8280  [ RTEMS_RECORD_MOUNT ] = "MOUNT",
    8381  [ RTEMS_RECORD_OPEN ] = "OPEN",
    84   [ RTEMS_RECORD_OVERFLOW ] = "OVERFLOW",
    8582  [ RTEMS_RECORD_PAGE_ALLOC ] = "PAGE_ALLOC",
    8683  [ RTEMS_RECORD_PAGE_FREE ] = "PAGE_FREE",
     84  [ RTEMS_RECORD_PER_CPU_COUNT ] = "PER_CPU_COUNT",
     85  [ RTEMS_RECORD_PER_CPU_HEAD ] = "PER_CPU_HEAD",
     86  [ RTEMS_RECORD_PER_CPU_OVERFLOW ] = "PER_CPU_OVERFLOW",
     87  [ RTEMS_RECORD_PER_CPU_TAIL ] = "PER_CPU_TAIL",
    8788  [ RTEMS_RECORD_POLL ] = "POLL",
    8889  [ RTEMS_RECORD_PROCESSOR ] = "PROCESSOR",
     
    138139  [ RTEMS_RECORD_STATVFS ] = "STATVFS",
    139140  [ RTEMS_RECORD_SYMLINK ] = "SYMLINK",
    140   [ RTEMS_RECORD_TAIL ] = "TAIL",
    141141  [ RTEMS_RECORD_TCP_INPUT ] = "TCP_INPUT",
    142142  [ RTEMS_RECORD_TCP_OUTPUT ] = "TCP_OUTPUT",
  • cpukit/libtrace/record/record.c

    r0a154d5 rd91951fb  
    116116    control->Header[ 0 ].event = RTEMS_RECORD_PROCESSOR;
    117117    control->Header[ 0 ].data = cpu_index;
    118     control->Header[ 1 ].event = RTEMS_RECORD_TAIL;
     118    control->Header[ 1 ].event = RTEMS_RECORD_PER_CPU_TAIL;
    119119    control->Header[ 1 ].data = tail;
    120     control->Header[ 2 ].event = RTEMS_RECORD_HEAD;
     120    control->Header[ 2 ].event = RTEMS_RECORD_PER_CPU_HEAD;
    121121    control->Header[ 2 ].data = head;
    122122    ( *visitor )( control->Header, RTEMS_ARRAY_SIZE( control->Header ), arg );
  • testsuites/libtests/record01/init.c

    r0a154d5 rd91951fb  
    112112static const rtems_record_item expected_items_8[] = {
    113113  { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
    114   { .event = TE(0, RTEMS_RECORD_TAIL), .data = 0 },
    115   { .event = TE(0, RTEMS_RECORD_HEAD), .data = 3 },
     114  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 0 },
     115  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 3 },
    116116  { .event = TE(2, UE(1)), .data = 3 },
    117117  { .event = TE(5, UE(4)), .data = 6 },
     
    121121static const rtems_record_item expected_items_9[] = {
    122122  { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
    123   { .event = TE(0, RTEMS_RECORD_TAIL), .data = 3 },
    124   { .event = TE(0, RTEMS_RECORD_HEAD), .data = 5 },
     123  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 3 },
     124  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 5 },
    125125  { .event = TE(11, UE(10)), .data = 12 },
    126126  { .event = TE(14, UE(13)), .data = 15 }
     
    129129static const rtems_record_item expected_items_10[] = {
    130130  { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
    131   { .event = TE(0, RTEMS_RECORD_TAIL), .data = 5 },
    132   { .event = TE(0, RTEMS_RECORD_HEAD), .data = 8 },
     131  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 5 },
     132  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 8 },
    133133  { .event = TE(17, UE(16)), .data = 18 },
    134134  { .event = TE(20, UE(19)), .data = 21 },
     
    138138static const rtems_record_item expected_items_11[] = {
    139139  { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
    140   { .event = TE(0, RTEMS_RECORD_TAIL), .data = 8 },
    141   { .event = TE(0, RTEMS_RECORD_HEAD), .data = 9 },
     140  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 8 },
     141  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 9 },
    142142  { .event = TE(26, UE(25)), .data = 27 }
    143143};
     
    145145static const rtems_record_item expected_items_12[] = {
    146146  { .event = TE(0, RTEMS_RECORD_PROCESSOR), .data = 0 },
    147   { .event = TE(0, RTEMS_RECORD_TAIL), .data = 9 },
    148   { .event = TE(0, RTEMS_RECORD_HEAD), .data = 15 },
     147  { .event = TE(0, RTEMS_RECORD_PER_CPU_TAIL), .data = 9 },
     148  { .event = TE(0, RTEMS_RECORD_PER_CPU_HEAD), .data = 15 },
    149149  { .event = TE(38, UE(37)), .data = 39 },
    150150  { .event = TE(41, UE(40)), .data = 42 },
     
    553553  n = read(fd, &item, sizeof(item));
    554554  rtems_test_assert(n == (ssize_t) sizeof(item));
    555   rtems_test_assert(item.event == TE(0, RTEMS_RECORD_COUNT));
     555  rtems_test_assert(item.event == TE(0, RTEMS_RECORD_PER_CPU_COUNT));
    556556  rtems_test_assert(item.data == ITEM_COUNT);
    557557
Note: See TracChangeset for help on using the changeset viewer.