RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libtrace: Move _Record_Stream_header_initialize()

Browse Source 
This fixes the build if no function sections are used.
This commit is contained in:
Sebastian Huber
2020-11-09 08:09:27 +01:00
parent 350bba7a04
commit 7f0379c8dd
4 changed files with 142 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpukit/Makefile.am
View File

@@ -479,6 +479,7 @@ librtemscpu_a_SOURCES += libtrace/record/record-dump-zfatal.c
librtemscpu_a_SOURCES += libtrace/record/record-dump-base64.c
librtemscpu_a_SOURCES += libtrace/record/record-dump-zbase64.c
librtemscpu_a_SOURCES += libtrace/record/record-server.c
librtemscpu_a_SOURCES += libtrace/record/record-stream-header.c
librtemscpu_a_SOURCES += libtrace/record/record-sysinit.c
librtemscpu_a_SOURCES += libtrace/record/record-text.c
librtemscpu_a_SOURCES += libtrace/record/record-userext.c

106
cpukit/libtrace/record/record-server.c
View File

@@ -31,11 +31,8 @@
#include <rtems/recordserver.h>
#include <rtems/record.h>
#include <rtems/version.h>
#include <rtems/score/threadimpl.h>
#include <rtems.h>
#include <sys/endian.h>
#include <sys/socket.h>
#include <sys/uio.h>
@@ -121,109 +118,6 @@ static void wakeup_timer( rtems_id timer, void *arg )
(void) rtems_timer_reset( timer );
}
size_t _Record_Stream_header_initialize( Record_Stream_header *header )
{
rtems_record_item *items;
size_t available;
size_t used;
const char *str;
#if BYTE_ORDER == LITTLE_ENDIAN
#if __INTPTR_WIDTH__ == 32
header->format = RTEMS_RECORD_FORMAT_LE_32,
#elif __INTPTR_WIDTH__ == 64
header->format = RTEMS_RECORD_FORMAT_LE_64,
#else
#error "unexpected __INTPTR_WIDTH__"
#endif
#elif BYTE_ORDER == BIG_ENDIAN
#if __INTPTR_WIDTH__ == 32
header->format = RTEMS_RECORD_FORMAT_BE_32,
#elif __INTPTR_WIDTH__ == 64
header->format = RTEMS_RECORD_FORMAT_BE_64,
#else
#error "unexpected __INTPTR_WIDTH__"
#endif
#else
#error "unexpected BYTE_ORDER"
#endif
header->magic = RTEMS_RECORD_MAGIC;
header->Version.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_VERSION );
header->Version.data = RTEMS_RECORD_THE_VERSION;
header->Processor_maximum.event =
RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PROCESSOR_MAXIMUM );
header->Processor_maximum.data = rtems_scheduler_get_processor_maximum() - 1;
header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PER_CPU_COUNT );
header->Count.data = _Record_Configuration.item_count;
header->Frequency.event =
RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_FREQUENCY );
header->Frequency.data = rtems_counter_frequency();
items = header->Info;
available = RTEMS_ARRAY_SIZE( header->Info );
str = CPU_NAME;
used = _Record_String_to_items(
RTEMS_RECORD_ARCH,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = CPU_MODEL_NAME;
used = _Record_String_to_items(
RTEMS_RECORD_MULTILIB,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = rtems_board_support_package();
used = _Record_String_to_items(
RTEMS_RECORD_BSP,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = rtems_version_control_key();
used = _Record_String_to_items(
RTEMS_RECORD_VERSION_CONTROL_KEY,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = __VERSION__;
used = _Record_String_to_items(
RTEMS_RECORD_TOOLS,
str,
strlen( str ),
items,
available
);
items += used;
return (size_t) ( (char *) items - (char *) header );
}
static void send_header( int fd )
{
Record_Stream_header header;

140
cpukit/libtrace/record/record-stream-header.c Normal file
View File

@@ -0,0 +1,140 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2018, 2019 embedded brains GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <rtems/record.h>
#include <rtems/version.h>
#include <rtems.h>
#include <sys/endian.h>
#include <string.h>
size_t _Record_Stream_header_initialize( Record_Stream_header *header )
{
rtems_record_item *items;
size_t available;
size_t used;
const char *str;
#if BYTE_ORDER == LITTLE_ENDIAN
#if __INTPTR_WIDTH__ == 32
header->format = RTEMS_RECORD_FORMAT_LE_32,
#elif __INTPTR_WIDTH__ == 64
header->format = RTEMS_RECORD_FORMAT_LE_64,
#else
#error "unexpected __INTPTR_WIDTH__"
#endif
#elif BYTE_ORDER == BIG_ENDIAN
#if __INTPTR_WIDTH__ == 32
header->format = RTEMS_RECORD_FORMAT_BE_32,
#elif __INTPTR_WIDTH__ == 64
header->format = RTEMS_RECORD_FORMAT_BE_64,
#else
#error "unexpected __INTPTR_WIDTH__"
#endif
#else
#error "unexpected BYTE_ORDER"
#endif
header->magic = RTEMS_RECORD_MAGIC;
header->Version.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_VERSION );
header->Version.data = RTEMS_RECORD_THE_VERSION;
header->Processor_maximum.event =
RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PROCESSOR_MAXIMUM );
header->Processor_maximum.data = rtems_scheduler_get_processor_maximum() - 1;
header->Count.event = RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_PER_CPU_COUNT );
header->Count.data = _Record_Configuration.item_count;
header->Frequency.event =
RTEMS_RECORD_TIME_EVENT( 0, RTEMS_RECORD_FREQUENCY );
header->Frequency.data = rtems_counter_frequency();
items = header->Info;
available = RTEMS_ARRAY_SIZE( header->Info );
str = CPU_NAME;
used = _Record_String_to_items(
RTEMS_RECORD_ARCH,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = CPU_MODEL_NAME;
used = _Record_String_to_items(
RTEMS_RECORD_MULTILIB,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = rtems_board_support_package();
used = _Record_String_to_items(
RTEMS_RECORD_BSP,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = rtems_version_control_key();
used = _Record_String_to_items(
RTEMS_RECORD_VERSION_CONTROL_KEY,
str,
strlen( str ),
items,
available
);
items += used;
available -= used;
str = __VERSION__;
used = _Record_String_to_items(
RTEMS_RECORD_TOOLS,
str,
strlen( str ),
items,
available
);
items += used;
return (size_t) ( (char *) items - (char *) header );
}

1
spec/build/cpukit/librtemscpu.yml
View File

@@ -973,6 +973,7 @@ source:
- cpukit/libtrace/record/record-dump-zbase64.c
- cpukit/libtrace/record/record-dump-zfatal.c
- cpukit/libtrace/record/record-server.c
- cpukit/libtrace/record/record-stream-header.c
- cpukit/libtrace/record/record-sysinit.c
- cpukit/libtrace/record/record-text.c
- cpukit/libtrace/record/record-userext.c