Skip to content

P
PPSi
Commit a39eb7df authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

log verbosity optimization 

ppsi handles the CONFIG_PPSI_RUNTIME_VERBOSITY, which make it reduce
executable size when runtime verbosity change is not required.
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent f71a2b5a
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 11 deletions
arch-spec/spec-socket.c
View file @ a39eb7df
......@@ -107,7 +107,6 @@ int spec_net_init(struct pp_instance *ppi)
ppi->buf_out = PROTO_PAYLOAD(ppi->buf_out);
ppi->buf_out+= 4 - (((int)ppi->buf_out) % 4); /* FIXME Alignment */
pp_printf("spec_net_init\n");
spec_open_ch(ppi);
return 0;
......
fsm.c
View file @ a39eb7df
......@@ -36,7 +36,7 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
/* found: handle this state */
ppi->next_state = state;
ppi->next_delay = 0;
if ((pp_diag_verbosity) || (ppi->is_new_state))
if (pp_diag_verbosity)
pp_diag_fsm(ppi, ip->name, STATE_ENTER, plen);
err = ip->f1(ppi, packet, plen);
if (!err && ip->f2)
......
include/ppsi/ppsi.h
View file @ a39eb7df
......@@ -16,17 +16,41 @@
/* Macros for diagnostic prints. Set pp_diag_verbosity as 0 or 1 (PP_V macros
* disabled/enabled) */
extern int pp_diag_verbosity;
#define PP_FSM(ppi,seq,len) pp_diag_fsm(ppi,seq,len)
#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_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
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
extern 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 */
/*
* Runtime options. Default values can be overridden by command line.
*/
......
proto-ext-whiterabbit/arith.c
View file @ a39eb7df
......@@ -12,7 +12,7 @@ void int64_to_TimeInternal(Integer64 bigint, TimeInternal *internal)
uint64_t bigint_val;
if (bigint.msb < 0)
pp_printf("BUG: %s doesn't support negatives\n", __func__);
PP_PRINTF("BUG: %s doesn't support negatives\n", __func__);
bigint_val = bigint.lsb;
bigint_val += ((int64_t)bigint.msb) << 32;
......
proto-ext-whiterabbit/state-faulty.c
View file @ a39eb7df
......@@ -14,7 +14,7 @@
int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen)
{
DSPOR(ppi)->portState = PPS_FAULTY;
pp_printf("event FAULT_CLEARED\n");
PP_PRINTF("Faulty state detected\n");
ppi->next_state = PPS_INITIALIZING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4;
return 0;
......
proto-ext-whiterabbit/state-initializing.c
View file @ a39eb7df
......@@ -92,7 +92,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
return 0;
failure:
pp_printf("Failed to initialize network\n");
PP_PRINTF("Failed to initialize network\n");
ppi->next_state = PPS_FAULTY;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
return 0;
......
proto-standard/arith.c
View file @ a39eb7df
......@@ -12,7 +12,7 @@ void int64_to_TimeInternal(Integer64 bigint, TimeInternal *internal)
uint64_t bigint_val;
if (bigint.msb < 0)
pp_printf("BUG: %s doesn't support negatives\n", __func__);
PP_PRINTF("BUG: %s doesn't support negatives\n", __func__);
bigint_val = bigint.lsb;
bigint_val += ((int64_t)bigint.msb) << 32;
......
proto-standard/state-faulty.c
View file @ a39eb7df
......@@ -14,7 +14,7 @@
int pp_faulty(struct pp_instance *ppi, unsigned char *pkt, int plen)
{
DSPOR(ppi)->portState = PPS_FAULTY;
pp_printf("event FAULT_CLEARED\n");
PP_PRINTF("Faulty state detected\n");
ppi->next_state = PPS_INITIALIZING;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS * 4;
return 0;
......
proto-standard/state-initializing.c
View file @ a39eb7df
......@@ -78,7 +78,7 @@ int pp_initializing(struct pp_instance *ppi, unsigned char *pkt, int plen)
return 0;
failure:
pp_printf("Failed to initialize network\n");
PP_PRINTF("Failed to initialize network\n");
ppi->next_state = PPS_FAULTY;
ppi->next_delay = PP_DEFAULT_NEXT_DELAY_MS;
return 0;
......
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