Skip to content

P
PPSi
Commit 33bbc975 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

diag: msg.c: use the newly introduced pp_Vprintf 

The pp_Vprintf (Verbose printf) macro, replaces PP_VPRINTF in the file
to ease generation of dumps.

All messages are build-time protected by "ifdef VERB_DUMP" anyways:
by removing the dependency on CONFIG_PPSI_RUNTIME_VERBOSITY it's
easier to enable the messages at build time because you just need
to set

   USER_CFLAGS="-DVERB_DUMP"

without the need to force RUNTIME_VERBOSITY as well.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 9e7692c8
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 29 deletions
include/ppsi/diag-macros.h
View file @ 33bbc975
......@@ -50,6 +50,9 @@ extern CONST_VERBOSITY int pp_diag_verbosity;
#define pp_error(...) \
if (pp_verbose_error && pp_diag_verbosity) pp_printf(__VA_ARGS__)
#define pp_Vprintf(...) \
if (pp_diag_verbosity > 1) pp_printf(__VA_ARGS__)
/*
* Then, we have this VERB_LOG_MSGS that used to be an ifdef. Provide
* constants instead, to avoid the hairyness of ifdef.
......
proto-standard/msg.c
View file @ 33bbc975
......@@ -10,72 +10,72 @@
static void Integer64_display(const char *label, Integer64 *bigint)
{
if (pp_verbose_dump) {
PP_VPRINTF("%s:\n", label);
PP_VPRINTF("LSB: %u\n", bigint->lsb);
PP_VPRINTF("MSB: %d\n", bigint->msb);
pp_Vprintf("%s:\n", label);
pp_Vprintf("LSB: %u\n", bigint->lsb);
pp_Vprintf("MSB: %d\n", bigint->msb);
}
}
static void UInteger48_display(const char *label, UInteger48 *bigint)
{
if (pp_verbose_dump) {
PP_VPRINTF("%s:\n", label);
PP_VPRINTF("LSB: %u\n", bigint->lsb);
PP_VPRINTF("MSB: %u\n", bigint->msb);
pp_Vprintf("%s:\n", label);
pp_Vprintf("LSB: %u\n", bigint->lsb);
pp_Vprintf("MSB: %u\n", bigint->msb);
}
}
static void timestamp_display(const char *label, Timestamp *timestamp)
{
if (pp_verbose_dump) {
PP_VPRINTF("%s:\n", label);
pp_Vprintf("%s:\n", label);
UInteger48_display("seconds", &timestamp->secondsField);
PP_VPRINTF("nanoseconds: %u\n", timestamp->nanosecondsField);
pp_Vprintf("nanoseconds: %u\n", timestamp->nanosecondsField);
}
}
static void msg_display_header(MsgHeader *header)
{
if (pp_verbose_dump) {
PP_VPRINTF("Message header:\n");
PP_VPRINTF("\n");
PP_VPRINTF("transportSpecific: %d\n",
pp_Vprintf("Message header:\n");
pp_Vprintf("\n");
pp_Vprintf("transportSpecific: %d\n",
header->transportSpecific);
PP_VPRINTF("messageType: %d\n", header->messageType);
PP_VPRINTF("versionPTP: %d\n", header->versionPTP);
PP_VPRINTF("messageLength: %d\n", header->messageLength);
PP_VPRINTF("domainNumber: %d\n", header->domainNumber);
PP_VPRINTF("FlagField %02x:%02x\n", header->flagField[0],
pp_Vprintf("messageType: %d\n", header->messageType);
pp_Vprintf("versionPTP: %d\n", header->versionPTP);
pp_Vprintf("messageLength: %d\n", header->messageLength);
pp_Vprintf("domainNumber: %d\n", header->domainNumber);
pp_Vprintf("FlagField %02x:%02x\n", header->flagField[0],
header->flagField[1]);
Integer64_display("correctionfield", &header->correctionfield);
/* FIXME diag portIdentity_display(&h->sourcePortIdentity); */
PP_VPRINTF("sequenceId: %d\n", header->sequenceId);
PP_VPRINTF("controlField: %d\n", header->controlField);
PP_VPRINTF("logMessageInterval: %d\n",
pp_Vprintf("sequenceId: %d\n", header->sequenceId);
pp_Vprintf("controlField: %d\n", header->controlField);
pp_Vprintf("logMessageInterval: %d\n",
header->logMessageInterval);
PP_VPRINTF("\n");
pp_Vprintf("\n");
}
}
static void msg_display_announce(MsgAnnounce *announce)
{
if (pp_verbose_dump) {
PP_VPRINTF("Message ANNOUNCE:\n");
pp_Vprintf("Message ANNOUNCE:\n");
timestamp_display("Origin Timestamp",
&announce->originTimestamp);
PP_VPRINTF("currentUtcOffset: %d\n",
pp_Vprintf("currentUtcOffset: %d\n",
announce->currentUtcOffset);
PP_VPRINTF("grandMasterPriority1: %d\n",
pp_Vprintf("grandMasterPriority1: %d\n",
announce->grandmasterPriority1);
PP_VPRINTF("grandMasterClockQuality:\n");
pp_Vprintf("grandMasterClockQuality:\n");
/* FIXME diag clockQuality_display(&ann->gmasterQuality); */
PP_VPRINTF("grandMasterPriority2: %d\n",
pp_Vprintf("grandMasterPriority2: %d\n",
announce->grandmasterPriority2);
PP_VPRINTF("grandMasterIdentity:\n");
pp_Vprintf("grandMasterIdentity:\n");
/* FIXME diag clockIdentity_display(ann->gmasterIdentity); */
PP_VPRINTF("stepsRemoved: %d\n", announce->stepsRemoved);
PP_VPRINTF("timeSource: %d\n", announce->timeSource);
PP_VPRINTF("\n");
pp_Vprintf("stepsRemoved: %d\n", announce->stepsRemoved);
pp_Vprintf("timeSource: %d\n", announce->timeSource);
pp_Vprintf("\n");
/* FIXME: diagnostic for extension */
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment