From 11fb09e38ffcbadc2629361377413f3ce12ec4da Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Thu, 6 Aug 2020 12:10:09 -0400 Subject: misc: harmonize names Type: fix Signed-off-by: Dave Barach Change-Id: Ibad744788e200ce012ad88ff59c2c34920742454 --- src/vlib/handoff_trace.c | 2 +- src/vlib/init.c | 2 +- src/vlib/main.c | 13 +++++++------ src/vlib/trace.c | 9 +++++---- src/vlib/trace_funcs.h | 10 +++++----- 5 files changed, 19 insertions(+), 17 deletions(-) (limited to 'src/vlib') diff --git a/src/vlib/handoff_trace.c b/src/vlib/handoff_trace.c index fcb514bd837..d268b565fe4 100644 --- a/src/vlib/handoff_trace.c +++ b/src/vlib/handoff_trace.c @@ -73,7 +73,7 @@ typedef enum { HANDOFF_TRACE_NEXT_DROP, HANDOFF_TRACE_N_NEXT, -} tdummy_next_t; +} tplaceholder_next_t; /* *INDENT-OFF* */ VLIB_REGISTER_NODE (handoff_trace_node, static) = diff --git a/src/vlib/init.c b/src/vlib/init.c index 135f9d582e9..9b43ca3cc26 100644 --- a/src/vlib/init.c +++ b/src/vlib/init.c @@ -377,7 +377,7 @@ vlib_call_init_exit_functions_no_sort (vlib_main_t * vm, clib_error_t * vlib_call_all_init_functions (vlib_main_t * vm) { - /* Call dummy functions to make sure purely static modules are + /* Call placeholder functions to make sure purely static modules are linked in. */ #define _(f) vlib_##f##_reference (); foreach_vlib_module_reference; diff --git a/src/vlib/main.c b/src/vlib/main.c index cb651e43a75..bada9bcfdff 100644 --- a/src/vlib/main.c +++ b/src/vlib/main.c @@ -1304,7 +1304,7 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, { vlib_node_main_t *nm = &vm->node_main; vlib_frame_t *f; - vlib_next_frame_t *nf, nf_dummy; + vlib_next_frame_t *nf, nf_placeholder; vlib_node_runtime_t *n; vlib_frame_t *restore_frame; vlib_pending_frame_t *p; @@ -1318,8 +1318,8 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, f = vlib_get_frame (vm, p->frame); if (p->next_frame_index == VLIB_PENDING_FRAME_NO_NEXT_FRAME) { - /* No next frame: so use dummy on stack. */ - nf = &nf_dummy; + /* No next frame: so use placeholder on stack. */ + nf = &nf_placeholder; nf->flags = f->frame_flags & VLIB_NODE_FLAG_TRACE; nf->frame = NULL; } @@ -2029,7 +2029,7 @@ vlib_main_configure (vlib_main_t * vm, unformat_input_t * input) VLIB_EARLY_CONFIG_FUNCTION (vlib_main_configure, "vlib"); static void -dummy_queue_signal_callback (vlib_main_t * vm) +placeholder_queue_signal_callback (vlib_main_t * vm) { } @@ -2075,7 +2075,7 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) clib_error_t *volatile error; vlib_node_main_t *nm = &vm->node_main; - vm->queue_signal_callback = dummy_queue_signal_callback; + vm->queue_signal_callback = placeholder_queue_signal_callback; /* Turn on event log. */ if (!vm->elog_main.event_ring_size) @@ -2307,7 +2307,8 @@ vlib_pcap_dispatch_trace_configure (vlib_pcap_dispatch_trace_args_t * a) vec_free (pm->pcap_data); memset (pm, 0, sizeof (*pm)); - vec_validate_aligned (vnet_trace_dummy, 2048, CLIB_CACHE_LINE_BYTES); + vec_validate_aligned (vnet_trace_placeholder, 2048, + CLIB_CACHE_LINE_BYTES); if (pm->lock == 0) clib_spinlock_init (&(pm->lock)); diff --git a/src/vlib/trace.c b/src/vlib/trace.c index f47c1b8c91d..384885a1a53 100644 --- a/src/vlib/trace.c +++ b/src/vlib/trace.c @@ -40,7 +40,7 @@ #include #include -u8 *vnet_trace_dummy; +u8 *vnet_trace_placeholder; /* Helper function for nodes which only trace buffer data. */ void @@ -374,8 +374,9 @@ cli_add_trace_buffer (vlib_main_t * vm, if (!unformat_user (input, unformat_line_input, line_input)) return 0; - if (vnet_trace_dummy == 0) - vec_validate_aligned (vnet_trace_dummy, 2048, CLIB_CACHE_LINE_BYTES); + if (vnet_trace_placeholder == 0) + vec_validate_aligned (vnet_trace_placeholder, 2048, + CLIB_CACHE_LINE_BYTES); while (unformat_check_input (line_input) != (uword) UNFORMAT_END_OF_INPUT) { @@ -554,7 +555,7 @@ VLIB_CLI_COMMAND (clear_trace_cli,static) = { }; /* *INDENT-ON* */ -/* Dummy function to get us linked in. */ +/* Placeholder function to get us linked in. */ void vlib_trace_cli_reference (void) { diff --git a/src/vlib/trace_funcs.h b/src/vlib/trace_funcs.h index b25237bd7e8..98bdb7e0a06 100644 --- a/src/vlib/trace_funcs.h +++ b/src/vlib/trace_funcs.h @@ -40,7 +40,7 @@ #ifndef included_vlib_trace_funcs_h #define included_vlib_trace_funcs_h -extern u8 *vnet_trace_dummy; +extern u8 *vnet_trace_placeholder; always_inline void vlib_validate_trace (vlib_trace_main_t * tm, vlib_buffer_t * b) @@ -60,10 +60,10 @@ vlib_add_trace_inline (vlib_main_t * vm, vlib_trace_header_t *h; u32 n_data_words; - ASSERT (vnet_trace_dummy); + ASSERT (vnet_trace_placeholder); if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_IS_TRACED) == 0)) - return vnet_trace_dummy; + return vnet_trace_placeholder; if (PREDICT_FALSE (tm->add_trace_callback != 0)) { @@ -74,8 +74,8 @@ vlib_add_trace_inline (vlib_main_t * vm, } else if (PREDICT_FALSE (tm->trace_enable == 0)) { - ASSERT (vec_len (vnet_trace_dummy) >= n_data_bytes + sizeof (*h)); - return vnet_trace_dummy; + ASSERT (vec_len (vnet_trace_placeholder) >= n_data_bytes + sizeof (*h)); + return vnet_trace_placeholder; } /* Are we trying to trace a handoff case? */ -- cgit 1.2.3-korg