mirror of https://github.com/thesofproject/sof.git
host: trace: revert host traces to fprintf
Host doesn't use trace mechanism - I've reverted all host traces to simple fprintf. Signed-off-by: Bartosz Kokoszko <bartoszx.kokoszko@linux.intel.com>
This commit is contained in:
Bartosz Kokoszko
parent
019eadebcf
commit
e69b42fccb
|
|
@ -251,12 +251,6 @@ int main(int argc, char **argv)
|
|||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/* set up trace class definition table from trace header */
|
||||
ret = setup_trace_table();
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "error: setting up trace header table\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
/* command line arguments*/
|
||||
parse_input_args(argc, argv);
|
||||
|
||||
|
|
@ -330,9 +324,6 @@ int main(int argc, char **argv)
|
|||
/* free all components/buffers in pipeline */
|
||||
free_comps();
|
||||
|
||||
/* free trace class defs */
|
||||
free_trace_table();
|
||||
|
||||
/* print test summary */
|
||||
printf("==========================================================\n");
|
||||
printf(" Test Summary\n");
|
||||
|
|
|
|||
215
src/host/trace.c
215
src/host/trace.c
|
|
@ -31,205 +31,46 @@
|
|||
* Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
||||
*/
|
||||
|
||||
#include <sof/preproc.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "host/common_test.h"
|
||||
#include "host/trace.h"
|
||||
|
||||
#define MAX_TRACE_CLASSES 255
|
||||
/* testbench trace definition */
|
||||
|
||||
/* enable trace by default in testbench */
|
||||
static int test_bench_trace = 1;
|
||||
int num_trace_classes;
|
||||
int test_bench_trace = 1;
|
||||
|
||||
/* set up trace class identifier table based on SOF trace header file */
|
||||
int setup_trace_table(void)
|
||||
{
|
||||
char buffer[2048];
|
||||
char *trace = "uapi/logging.h";
|
||||
char *trace_filename = malloc(strlen(SOF_INC) + strlen(trace) + 2);
|
||||
char *token;
|
||||
int ret, i = 0;
|
||||
size_t size;
|
||||
FILE *fp;
|
||||
|
||||
/* set up trace file name using include directory prefix */
|
||||
sprintf(trace_filename, "%s/%s", SOF_INC, trace);
|
||||
|
||||
fp = fopen(trace_filename, "r");
|
||||
if (!fp) {
|
||||
fprintf(stderr, "error: opening trace include file %s\n",
|
||||
trace_filename);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* find number of trace classes defined */
|
||||
while (fgets(buffer, sizeof(buffer), fp)) {
|
||||
char identifier[1024];
|
||||
int value = 0, shift = 0;
|
||||
|
||||
ret = sscanf(buffer, "#define %s (%d << %d)", identifier,
|
||||
&value, &shift);
|
||||
if (ret == 3) {
|
||||
/* if TRACE_CLASS definition */
|
||||
if (strstr(identifier, "TRACE_CLASS"))
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
num_trace_classes = i;
|
||||
|
||||
/* allocate memory for trace table */
|
||||
size = sizeof(struct trace_class_table);
|
||||
trace_table = (struct trace_class_table *)malloc(size *
|
||||
num_trace_classes);
|
||||
|
||||
/* rewind file pointer */
|
||||
fseek(fp, 0, SEEK_SET);
|
||||
|
||||
i = 0;
|
||||
|
||||
/* read lines from header */
|
||||
while (fgets(buffer, sizeof(buffer), fp)) {
|
||||
char identifier[1024];
|
||||
int value = 0, shift = 0;
|
||||
|
||||
ret = sscanf(buffer, "#define %s (%d << %d)", identifier,
|
||||
&value, &shift);
|
||||
if (ret == 3) {
|
||||
/* if TRACE_CLASS definition */
|
||||
if (strstr(identifier, "TRACE_CLASS")) {
|
||||
/* extract subsystem name */
|
||||
token = strtok(identifier, "_");
|
||||
token = strtok(NULL, "_");
|
||||
token = strtok(NULL, "_");
|
||||
|
||||
/* add trace class entry */
|
||||
trace_table[i].trace_class = value;
|
||||
trace_table[i].class_name = strdup(token);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
free(trace_filename);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void free_trace_table(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < num_trace_classes; i++)
|
||||
free(trace_table[i].class_name);
|
||||
|
||||
free(trace_table);
|
||||
}
|
||||
#define CASE(x) case TRACE_CLASS_##x: return #x
|
||||
|
||||
/* look up subsystem class name from table */
|
||||
static char *get_trace_class(uint32_t trace_class)
|
||||
char *get_trace_class(uint32_t trace_class)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* look up trace class table and return subsystem name */
|
||||
for (i = 0; i < num_trace_classes; i++) {
|
||||
if (trace_table[i].trace_class == trace_class)
|
||||
return trace_table[i].class_name;
|
||||
switch (trace_class) {
|
||||
CASE(IRQ);
|
||||
CASE(IPC);
|
||||
CASE(PIPE);
|
||||
CASE(HOST);
|
||||
CASE(DAI);
|
||||
CASE(DMA);
|
||||
CASE(SSP);
|
||||
CASE(COMP);
|
||||
CASE(WAIT);
|
||||
CASE(LOCK);
|
||||
CASE(MEM);
|
||||
CASE(MIXER);
|
||||
CASE(BUFFER);
|
||||
CASE(VOLUME);
|
||||
CASE(SWITCH);
|
||||
CASE(MUX);
|
||||
CASE(SRC);
|
||||
CASE(TONE);
|
||||
CASE(EQ_FIR);
|
||||
CASE(EQ_IIR);
|
||||
CASE(SA);
|
||||
CASE(DMIC);
|
||||
CASE(POWER);
|
||||
default: return "unknown";
|
||||
}
|
||||
|
||||
return "value";
|
||||
}
|
||||
|
||||
#define META_SEQ_STEP_param_procU(i, _) META_CONCAT(param, i) %u
|
||||
|
||||
#define HOST_TRACE_EVENT_NTH_PARAMS(id_count, param_count) \
|
||||
uintptr_t event \
|
||||
META_SEQ_FROM_0_TO(id_count , META_SEQ_STEP_id_uint32_t) \
|
||||
META_SEQ_FROM_0_TO(param_count, META_SEQ_STEP_param_uint32_t)
|
||||
|
||||
#define HOST_TRACE_EVENT_NTH(postfix, param_count) \
|
||||
META_FUNC_WITH_VARARGS( \
|
||||
_trace_event, META_CONCAT(postfix, param_count), \
|
||||
void, HOST_TRACE_EVENT_NTH_PARAMS(2, param_count) \
|
||||
)
|
||||
|
||||
/* print trace event */
|
||||
#define HOST_TRACE_EVENT_NTH_IMPL(arg_count) \
|
||||
HOST_TRACE_EVENT_NTH(, arg_count) \
|
||||
{ \
|
||||
char a, b, c; \
|
||||
\
|
||||
if (test_bench_trace > 0) { \
|
||||
/* look up subsystem from trace class table */ \
|
||||
char *trace_class = strdup(get_trace_class(event >> 24));\
|
||||
\
|
||||
a = event & 0xff; \
|
||||
b = (event >> 8) & 0xff; \
|
||||
c = (event >> 16) & 0xff; \
|
||||
\
|
||||
/* print trace event stderr*/ \
|
||||
if (!strcmp(trace_class, "value")) \
|
||||
fprintf(stderr, \
|
||||
"Trace value %lu, "META_QUOTE( \
|
||||
META_SEQ_FROM_0_TO(arg_count, \
|
||||
META_SEQ_STEP_param_procU \
|
||||
))"\n" \
|
||||
, event META_SEQ_FROM_0_TO(arg_count, \
|
||||
META_SEQ_STEP_param)); \
|
||||
else \
|
||||
fprintf(stderr, \
|
||||
"Trace %s %c%c%c\n" \
|
||||
, trace_class, c, b, a); \
|
||||
if (trace_class) \
|
||||
free(trace_class); \
|
||||
} \
|
||||
} \
|
||||
HOST_TRACE_EVENT_NTH(_mbox_atomic, arg_count) \
|
||||
{ \
|
||||
META_CONCAT(_trace_event, arg_count) \
|
||||
(event META_SEQ_FROM_0_TO(2, META_SEQ_STEP_id) \
|
||||
META_SEQ_FROM_0_TO(arg_count, META_SEQ_STEP_param)); \
|
||||
}
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event0( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic0(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(0);
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event1( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic1(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(1);
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event2( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic2(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(2);
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event3( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic3(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(3);
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event4( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic4(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(4);
|
||||
|
||||
/* Implementation of
|
||||
* void _trace_event5( uint32_t log_entry, uint32_t params...) {...}
|
||||
* void _trace_event_mbox_atomic5(uint32_t log_entry, uint32_t params...) {...}
|
||||
*/
|
||||
HOST_TRACE_EVENT_NTH_IMPL(5);
|
||||
|
||||
/* enable trace in testbench */
|
||||
void tb_enable_trace(bool enable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,17 +33,6 @@
|
|||
#ifndef _TRACE_H
|
||||
#define _TRACE_H
|
||||
|
||||
struct trace_class_table {
|
||||
int trace_class;
|
||||
char *class_name;
|
||||
};
|
||||
|
||||
struct trace_class_table *trace_table;
|
||||
|
||||
void tb_enable_trace(bool enable);
|
||||
|
||||
int setup_trace_table(void);
|
||||
|
||||
void free_trace_table(void);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
/*
|
||||
* Copyright (c) 2016, Intel Corporation
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * 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.
|
||||
* * Neither the name of the Intel Corporation nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
||||
* Keyon Jie <yang.jie@linux.intel.com>
|
||||
* Artur Kloniecki <arturx.kloniecki@linux.intel.com>
|
||||
*/
|
||||
* Copyright (c) 2016, Intel Corporation
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * 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.
|
||||
* * Neither the name of the Intel Corporation nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
||||
* Keyon Jie <yang.jie@linux.intel.com>
|
||||
* Artur Kloniecki <arturx.kloniecki@linux.intel.com>
|
||||
*/
|
||||
|
||||
#ifndef __INCLUDE_TRACE__
|
||||
#define __INCLUDE_TRACE__
|
||||
|
|
@ -114,6 +114,19 @@
|
|||
#define TRACEE 1
|
||||
#define TRACEM 0 /* send all trace messages to mbox and local trace buffer */
|
||||
|
||||
#ifdef CONFIG_HOST
|
||||
extern int test_bench_trace;
|
||||
char *get_trace_class(uint32_t trace_class);
|
||||
#define _log_message(mbox, atomic, level, comp_class, id_0, id_1, \
|
||||
has_ids, format, ...) \
|
||||
{ \
|
||||
if (test_bench_trace) { \
|
||||
char *msg = "%s " format; \
|
||||
fprintf(stderr, msg, get_trace_class(comp_class), \
|
||||
##__VA_ARGS__); \
|
||||
} \
|
||||
}
|
||||
#else
|
||||
#define _TRACE_EVENT_NTH_PARAMS(id_count, param_count) \
|
||||
uintptr_t log_entry \
|
||||
META_SEQ_FROM_0_TO(id_count , META_SEQ_STEP_id_uint32_t) \
|
||||
|
|
@ -198,7 +211,7 @@ _TRACE_EVENT_NTH_DECLARE_GROUP(4)
|
|||
* uint32_t params...);
|
||||
*/
|
||||
_TRACE_EVENT_NTH_DECLARE_GROUP(5)
|
||||
|
||||
#endif
|
||||
#define _TRACE_EVENT_MAX_ARGUMENT_COUNT 5
|
||||
|
||||
void trace_flush(void);
|
||||
|
|
@ -207,24 +220,24 @@ void trace_init(struct sof *sof);
|
|||
|
||||
#if TRACE
|
||||
/*
|
||||
* trace_event macro definition
|
||||
*
|
||||
* trace_event() macro is used for logging events that occur at runtime.
|
||||
* It comes in 2 main flavours, atomic and non-atomic. Depending of definitions
|
||||
* above, it might also propagate log messages to mbox if desired.
|
||||
*
|
||||
* First argument is always class of event being logged, as defined in
|
||||
* uapi/logging.h.
|
||||
* Second argument is string literal in printf format, followed by up to 4
|
||||
* parameters (uint32_t), that are used to expand into string fromat when
|
||||
* parsing log data.
|
||||
*
|
||||
* All compile-time accessible data (verbosity, class, source file name, line
|
||||
* index and string literal) are linked into .static_log_entries section
|
||||
* of binary and then extracted by rimage, so they do not contribute to loadable
|
||||
* image size. This way more elaborate log messages are possible and encouraged,
|
||||
* for better debugging experience, without worrying about runtime performance.
|
||||
*/
|
||||
* trace_event macro definition
|
||||
*
|
||||
* trace_event() macro is used for logging events that occur at runtime.
|
||||
* It comes in 2 main flavours, atomic and non-atomic. Depending of definitions
|
||||
* above, it might also propagate log messages to mbox if desired.
|
||||
*
|
||||
* First argument is always class of event being logged, as defined in
|
||||
* uapi/logging.h.
|
||||
* Second argument is string literal in printf format, followed by up to 4
|
||||
* parameters (uint32_t), that are used to expand into string fromat when
|
||||
* parsing log data.
|
||||
*
|
||||
* All compile-time accessible data (verbosity, class, source file name, line
|
||||
* index and string literal) are linked into .static_log_entries section
|
||||
* of binary and then extracted by rimage, so they do not contribute to loadable
|
||||
* image size. This way more elaborate log messages are possible and encouraged,
|
||||
* for better debugging experience, without worrying about runtime performance.
|
||||
*/
|
||||
#define trace_event(class, format, ...) \
|
||||
_trace_event_with_ids(class, -1, -1, 0, format, ##__VA_ARGS__)
|
||||
#define trace_event_atomic(class, format, ...) \
|
||||
|
|
@ -295,6 +308,7 @@ void trace_init(struct sof *sof);
|
|||
#define trace_error_value_atomic(x)
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_HOST
|
||||
#define _DECLARE_LOG_ENTRY(lvl, format, comp_class, params, ids)\
|
||||
__attribute__((section(".static_log." #lvl))) \
|
||||
static const struct { \
|
||||
|
|
@ -332,7 +346,7 @@ _thrown_from_macro_BASE_LOG_in_trace_h
|
|||
); \
|
||||
META_CONCAT(function_name, \
|
||||
META_COUNT_VARAGS_BEFORE_COMPILE(__VA_ARGS__)) \
|
||||
((uintptr_t)entry, id_0, id_1, ##__VA_ARGS__); \
|
||||
((uint32_t)entry, id_0, id_1, ##__VA_ARGS__); \
|
||||
}
|
||||
|
||||
#define __log_message(func_name, lvl, comp_class, id_0, id_1, has_ids, \
|
||||
|
|
@ -348,7 +362,7 @@ _thrown_from_macro_BASE_LOG_in_trace_h
|
|||
__log_message(META_CONCAT_SEQ(_trace_event, mbox, atomic), \
|
||||
level, comp_class, id_0, id_1, has_ids, format, \
|
||||
##__VA_ARGS__)
|
||||
|
||||
#endif
|
||||
#else
|
||||
|
||||
#define trace_event(...)
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ struct log_entry_header {
|
|||
uint32_t core_id : 8; /* Reporting core's id */
|
||||
|
||||
uint64_t timestamp; /* Timestamp (in dsp ticks) */
|
||||
uintptr_t log_entry_address; /* Address of log entry in ELF */
|
||||
uint32_t log_entry_address; /* Address of log entry in ELF */
|
||||
} __attribute__((__packed__));
|
||||
|
||||
#endif //#ifndef __INCLUDE_LOGGING__
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ static struct trace *trace;
|
|||
#define TRACE_ID_MASK ((1 << TRACE_ID_LENGTH) - 1)
|
||||
|
||||
static void put_header(volatile uint32_t *dst, uint32_t id_0, uint32_t id_1,
|
||||
uintptr_t entry, uint64_t timestamp)
|
||||
uint32_t entry, uint64_t timestamp)
|
||||
{
|
||||
struct log_entry_header header;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue