Skip to content

P
PPSi
Commit 433ad6a3 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

diag: documented status and prepared changes 

This commit makes no technical changesin the output, but it creates
<ppsi/diag-macros.h> (always includes) to split out all the
diag-related stuff.  The macros in there are the same as in previous
commits, but they are documented.

This also introduces pp_verbose_messages (which is 1 or 0) to allow
the various "#ifdef VERB_LOG_MSGS" to become language if() instead.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 1c8ece02
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 40 deletions
include/ppsi/diag-macros.h 0 → 100644
View file @ 433ad6a3
/*
* Macros for diagnostic prints. The thing is not trivial because
* we need to remove all strings and parameter passing when running
* wrpc-sw with all its options enabled, for space reasons.
*
* So, this first set is always enabled, unless you build with
* PPSI_NO_DIAG (see diag/Makefile)
*/
#define PP_FSM(ppi,seq,len) pp_diag_fsm(ppi,seq,len)
#define PP_ERR(ppi,err) if pp_diag_error(ppi,err)
#define PP_ERR2(ppi,s1,s2) if pp_diag_error_str2(ppi,s1,s2)
#define PP_FATAL(ppi,s1,s2) if pp_diag_fatal(ppi,s1,s2)
/*
* Then we have a verbosity argument, that can be changed at run time
* or not. If it can be changed, stuff works like this, depending on
* an integer value somewhere (it is incremented by each -V on a host run)
*/
#ifdef CONFIG_PPSI_RUNTIME_VERBOSITY
#define CONST_VERBOSITY /* nothing: use "int pp_diag_verbosity" */
extern int pp_diag_verbosity;
#define PP_VFSM(ppi,seq,len) if (pp_diag_verbosity) pp_diag_fsm(ppi,seq,len)
#define PP_VTR(ppi,f,l) if (pp_diag_verbosity) pp_diag_trace(ppi,f,l)
#define PP_PRINTF(...) if (pp_diag_verbosity) pp_printf(__VA_ARGS__)
#define PP_TPRINTF(...) pp_timed_printf(__VA_ARGS__)
#define PP_VPRINTF(...) if (pp_diag_verbosity > 1) pp_printf(__VA_ARGS__)
#else
/*
* If verbosity cannot be changed at run time, we have CONFIG_PPSI_VERBOSITY
* set at build time (or at Kconfig time when we add it)
*/
#define CONST_VERBOSITY const /* use "const int pp_diag_verbosity */
#if CONFIG_PPSI_VERBOSITY > 0
#define PP_VFSM(ppi,seq,len) if (pp_diag_verbosity) pp_diag_fsm(ppi,seq,len)
#define PP_VTR(ppi,f,l) if (pp_diag_verbosity) pp_diag_trace(ppi,f,l)
#define PP_PRINTF(...) if (pp_diag_verbosity) pp_printf(__VA_ARGS__)
#define PP_TPRINTF(...) pp_timed_printf(__VA_ARGS__)
#define PP_VPRINTF(...) if (pp_diag_verbosity > 1) pp_printf(__VA_ARGS__)
#else
#define PP_VFSM(ppi,seq,len)
#define PP_VTR(ppi,f,l)
#define PP_PRINTF(...)
#define PP_TPRINTF(...)
#define PP_VPRINTF(...)
#endif /* CONFIG_PPSI_VERBOSITY > 0 */
#endif /* CONFIG_PPSI_RUNTIME_VERBOSITY */
extern CONST_VERBOSITY int pp_diag_verbosity;
/*
* Then, we have this VERB_LOG_MSGS that used to be an ifdef. Provide
* constants instead, to avoid the hairyness of ifdef.
*/
#ifdef VERB_LOG_MSGS
#define pp_verbose_messages 1
#else
#define pp_verbose_messages 0
#endif
include/ppsi/ppsi.h
View file @ 433ad6a3
......@@ -8,52 +8,13 @@
#include <stdint.h>
#include <stdarg.h>
#include <arch/arch.h> /* ntohs and so on */
#include <ppsi/diag-macros.h>
#include <ppsi/lib.h>
#include <ppsi/ieee1588_types.h>
#include <ppsi/constants.h>
#define __weak __attribute__((weak))
/* Macros for diagnostic prints. Set pp_diag_verbosity as 0 or 1 (PP_V macros
* disabled/enabled) */
#define PP_FSM(ppi,seq,len) pp_diag_fsm(ppi,seq,len)
#define PP_ERR(ppi,err) if pp_diag_error(ppi,err)
#define PP_ERR2(ppi,s1,s2) if pp_diag_error_str2(ppi,s1,s2)
#define PP_FATAL(ppi,s1,s2) if pp_diag_fatal(ppi,s1,s2)
#ifdef CONFIG_PPSI_RUNTIME_VERBOSITY
#define CONST_VERBOSITY /* nothing: use "int pp_diag_verbosity" */
extern int pp_diag_verbosity;
#define PP_VFSM(ppi,seq,len) if (pp_diag_verbosity) pp_diag_fsm(ppi,seq,len)
#define PP_VTR(ppi,f,l) if (pp_diag_verbosity) pp_diag_trace(ppi,f,l)
#define PP_PRINTF(...) if (pp_diag_verbosity) pp_printf(__VA_ARGS__)
#define PP_TPRINTF(...) pp_timed_printf(__VA_ARGS__)
#define PP_VPRINTF(...) if (pp_diag_verbosity > 1) pp_printf(__VA_ARGS__)
#else
#define CONST_VERBOSITY const /* use "const int pp_diag_verbosity */
#if CONFIG_PPSI_VERBOSITY > 0
#define PP_VFSM(ppi,seq,len) if (pp_diag_verbosity) pp_diag_fsm(ppi,seq,len)
#define PP_VTR(ppi,f,l) if (pp_diag_verbosity) pp_diag_trace(ppi,f,l)
#define PP_PRINTF(...) if (pp_diag_verbosity) pp_printf(__VA_ARGS__)
#define PP_TPRINTF(...) pp_timed_printf(__VA_ARGS__)
#define PP_VPRINTF(...) if (pp_diag_verbosity > 1) pp_printf(__VA_ARGS__)
#else
#define PP_VFSM(ppi,seq,len)
#define PP_VTR(ppi,f,l)
#define PP_PRINTF(...)
#define PP_TPRINTF(...)
#define PP_VPRINTF(...)
#endif /* CONFIG_PPSI_VERBOSITY > 0 */
#endif /* CONFIG_PPSI_RUNTIME_VERBOSITY */
extern CONST_VERBOSITY int pp_diag_verbosity;
/*
* Runtime options. Default values can be overridden by command line.
*/
......
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