{
u64 bitmap = va_arg (*args, u64);
int next_split = _line_len;
- int indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (!bitmap)
return format (s, "none");
{
u32 bitmap = va_arg (*args, u32);
int next_split = _line_len;
- int indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (!bitmap)
return format (s, "none");
{
u32 bitmap = va_arg (*args, u32);
int next_split = _line_len;
- int indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (!bitmap)
return format (s, "none");
{
dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
clib_error_t *e;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
vec_foreach (e, xd->errors)
{
int verbose = va_arg (*args, int);
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, dev_instance);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
f64 now = vlib_time_now (dm->vlib_main);
struct rte_eth_dev_info di;
dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
s = format (s, "%U tx queue %d",
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
format_function_t *f;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
s = format (s, "%U rx queue %d",
format_dpdk_pkt_types (u8 * s, va_list * va)
{
u32 *pkt_types = va_arg (*va, u32 *);
- uword indent __attribute__ ((unused)) = format_get_indent (s) + 2;
+ u32 indent __attribute__ ((unused)) = format_get_indent (s) + 2;
if (!*pkt_types)
return s;
format_dpdk_pkt_offload_flags (u8 * s, va_list * va)
{
u64 *ol_flags = va_arg (*va, u64 *);
- uword indent = format_get_indent (s) + 2;
+ u32 indent = format_get_indent (s) + 2;
if (!*ol_flags)
return s;
{
struct rte_mbuf *mb = va_arg (*va, struct rte_mbuf *);
ethernet_header_t *eth_hdr = va_arg (*va, ethernet_header_t *);
- uword indent = format_get_indent (s) + 2;
+ u32 indent = format_get_indent (s) + 2;
s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
"\n%Ubuf_len %d, data_len %d, ol_flags 0x%x, data_off %d, phys_addr 0x%x"
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s,
"FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "
va_arg (*va, ixge_rx_from_hw_descriptor_t *);
u32 s0 = d->status[0], s2 = d->status[2];
u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%s-owned",
(s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" :
{
ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *);
u32 s0 = d->status0, s1 = d->status1;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
u32 v;
s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer",
ixge_main_t *xm = &ixge_main;
ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
format_function_t *f;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
{
vnet_sw_interface_t *sw =
ixge_main_t *xm = &ixge_main;
ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index);
format_function_t *f;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
{
vnet_sw_interface_t *sw =
ixge_main_t *xm = &ixge_main;
ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance);
ixge_phy_t *phy = xd->phys + xd->phy_index;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
ixge_update_counters (xd);
xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status;
{
lb_main_t *lbm = &lb_main;
lb_vip_t *vip = va_arg (*args, lb_vip_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format(s, "%U %U [%u] %U%s\n"
"%U new_size:%u\n",
memif_if_t *mif = va_arg (*args, memif_if_t *);
memif_queue_t *mq = va_arg (*args, memif_queue_t *);
uword i = va_arg (*args, uword);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U%s ring %u:\n",
format_white_space, indent,
{
memif_if_t *mif = va_arg (*args, memif_if_t *);
memif_queue_t *mq = va_arg (*args, memif_queue_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
memif_ring_t *ring;
u16 ring_size;
u16 slot;
{
u32 dev_instance = va_arg (*args, u32);
int verbose = va_arg (*args, int);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "MEMIF interface");
if (verbose)
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
memif_input_trace_t *t = va_arg (*args, memif_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "memif: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);
svm_fifo_t *f;
int i;
u32 count;
- uword indent = format_get_indent (s) + 2;
+ u32 indent = format_get_indent (s) + 2;
sh = sp->ssvm.sh;
fsh = (svm_fifo_segment_header_t *) sh->opaque[0];
char *vlib_app_name;
char *input_filename;
node_vft_t *the_vft[NODE_N_TYPES];
-static int indent;
+static u32 indent;
static int dont_output_version;
int dump_tree;
static char *fixed_name;
/* Print short or long form depending on byte count. */
uword short_form = n_bytes <= 32;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (n_bytes == 0)
return s;
format_vlib_buffer (u8 * s, va_list * args)
{
vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "current data %d, length %d, free-list %d, clone-count %u",
b->current_data, b->current_length,
mc_main_t *mcm = va_arg (*args, mc_main_t *);
mc_stream_t *t;
mc_stream_peer_t *p, *ps;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "MC state %U, %d streams joined, global sequence 0x%x",
format_mc_relay_state, mcm->relay_state,
f64 x;
f64 maxc, maxcn;
u32 maxn;
- uword indent;
+ u32 indent;
if (!n)
{
vlib_node_main_t *nm = va_arg (*va, vlib_node_main_t *);
vlib_node_t *n = va_arg (*va, vlib_node_t *);
int i, j;
- uword indent;
+ u32 indent;
typedef struct
{
u32 next_node;
{
u8 *data = va_arg (*args, u8 *);
u8 *id = va_arg (*args, u8 *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
char *string_types[] = { "PN", "EC", "SN", "MN", 0 };
uword p = 0;
int first_line = 1;
{
vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *);
u32 max_data_bytes = va_arg (*args, u32);
- CLIB_UNUSED (uword indent) = va_arg (*args, u32);
+ CLIB_UNUSED (u32 indent) = va_arg (*args, u32);
vnet_main_t *vnm = vnet_get_main ();
if (rw->sw_if_index != ~0)
format_bfd_session (u8 * s, va_list * args)
{
const bfd_session_t *bs = va_arg (*args, bfd_session_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "bs_idx=%u local-state=%s remote-state=%s\n"
"%Ulocal-discriminator=%u remote-discriminator=%u\n"
"%Ulocal-diag=%s echo-active=%s\n"
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "af_packet: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);
int verbose = va_arg (*args, int);
netmap_main_t *nm = &netmap_main;
netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "NETMAP interface");
if (verbose)
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "netmap: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U %U queue %d\n", format_white_space, indent,
format_vnet_sw_interface_name, vnm, sw, t->qid);
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
interface_rx_dpo_trace_t * t = va_arg (*args, interface_rx_dpo_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U sw_if_index:%d",
format_white_space, indent,
t->sw_if_index);
}
u8*
-format_load_balance_map (u8 *s, va_list ap)
+format_load_balance_map (u8 *s, va_list * ap)
{
- index_t lbmi = va_arg(ap, index_t);
- u32 indent = va_arg(ap, u32);
+ index_t lbmi = va_arg(*ap, index_t);
+ u32 indent = va_arg(*ap, u32);
load_balance_map_t *lbm;
u32 n_buckets, ii;
extern void load_balance_map_path_state_change(fib_node_index_t path_index);
-extern u8* format_load_balance_map(u8 *s, va_list ap);
+extern u8* format_load_balance_map(u8 *s, va_list *ap);
extern void load_balance_map_show_mem(void);
/**
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U fib-index:%d addr:%U load-balance:%d",
format_white_space, indent,
t->fib_index,
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
lookup_trace_t * t = va_arg (*args, lookup_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
mpls_unicast_header_t hdr;
hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
mpls_label_imposition_trace_t * t;
mpls_unicast_header_t hdr;
- uword indent;
+ u32 indent;
t = va_arg (*args, mpls_label_imposition_trace_t *);
indent = format_get_indent (s);
{
ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
u32 max_header_bytes = va_arg (*va, u32);
- uword indent;
+ u32 indent;
u16 l2_type, l3_type;
if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)
ethernet_type_t type = clib_net_to_host_u16 (e->type);
ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
u32 n_vlan = 0, i, header_bytes;
- uword indent;
+ u32 indent;
while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
|| type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))
format_sfp_eeprom (u8 * s, va_list * args)
{
sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
int i;
if (e->id != SFP_ID_sfp)
}
u8*
-format_fib_table_name (u8* s, va_list ap)
+format_fib_table_name (u8* s, va_list* ap)
{
- fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
- fib_protocol_t proto = va_arg(ap, int); // int promotion
+ fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t);
+ fib_protocol_t proto = va_arg(*ap, int); // int promotion
fib_table_t *fib_table;
fib_table = fib_table_get(fib_index, proto);
* @brief
* Format the description/name of the table
*/
-extern u8* format_fib_table_name(u8* s, va_list ap);
+extern u8* format_fib_table_name(u8* s, va_list *ap);
/**
* @brief
int
fib_test_validate_rep_v (const replicate_t *rep,
u16 n_buckets,
- va_list ap)
+ va_list *ap)
{
const fib_test_rep_bucket_t *exp;
const dpo_id_t *dpo;
for (bucket = 0; bucket < n_buckets; bucket++)
{
- exp = va_arg(ap, fib_test_rep_bucket_t*);
+ exp = va_arg(*ap, fib_test_rep_bucket_t*);
dpo = replicate_get_bucket_i(rep, bucket);
int
fib_test_validate_lb_v (const load_balance_t *lb,
u16 n_buckets,
- va_list ap)
+ va_list *ap)
{
const dpo_id_t *dpo;
int bucket;
{
const fib_test_lb_bucket_t *exp;
- exp = va_arg(ap, fib_test_lb_bucket_t*);
+ exp = va_arg(*ap, fib_test_lb_bucket_t*);
dpo = load_balance_get_bucket_i(lb, bucket);
switch (exp->type)
const replicate_t *rep;
rep = replicate_get(dpo.dpoi_index);
- res = fib_test_validate_rep_v(rep, n_buckets, ap);
+ res = fib_test_validate_rep_v(rep, n_buckets, &ap);
}
else
{
format_dpo_type, dpo.dpoi_type);
lb = load_balance_get(dpo.dpoi_index);
- res = fib_test_validate_lb_v(lb, n_buckets, ap);
+ res = fib_test_validate_lb_v(lb, n_buckets, &ap);
/*
* ensure that the LB contributed by the entry is the
extern int fib_test_validate_rep_v(const replicate_t *rep,
u16 n_buckets,
- va_list ap);
+ va_list *ap);
extern int fib_test_validate_lb_v(const load_balance_t *lb,
u16 n_buckets,
- va_list ap);
+ va_list *ap);
extern int fib_test_validate_entry(fib_node_index_t fei,
fib_forward_chain_type_t fct,
static const char* fib_forw_chain_names[] = FIB_FORW_CHAINS;
u8 *
-format_fib_protocol (u8 * s, va_list ap)
+format_fib_protocol (u8 * s, va_list * ap)
{
- fib_protocol_t proto = va_arg(ap, int); // fib_protocol_t promotion
+ fib_protocol_t proto = va_arg(*ap, int); // fib_protocol_t promotion
return (format (s, "%s", fib_protocol_names[proto]));
}
u8 *
-format_vnet_link (u8 * s, va_list ap)
+format_vnet_link (u8 * s, va_list * ap)
{
- vnet_link_t link = va_arg(ap, int); // vnet_link_t promotion
+ vnet_link_t link = va_arg(*ap, int); // vnet_link_t promotion
return (format (s, "%s", vnet_link_names[link]));
}
for (_item = FIB_TYPE_SPEICAL_FIRST; \
_item <= FIB_SPEICAL_TYPE_LAST; _item++)
-extern u8 * format_fib_protocol(u8 * s, va_list ap);
-extern u8 * format_vnet_link(u8 *s, va_list ap);
+extern u8 * format_fib_protocol(u8 * s, va_list *ap);
+extern u8 * format_vnet_link(u8 *s, va_list *ap);
/**
* Path flags from the control plane
fib_urpf_list_t *fib_urpf_list_pool;
u8 *
-format_fib_urpf_list (u8 *s, va_list args)
+format_fib_urpf_list (u8 *s, va_list *args)
{
fib_urpf_list_t *urpf;
index_t ui;
u32 *swi;
- ui = va_arg(args, index_t);
+ ui = va_arg(*args, index_t);
if (INDEX_INVALID != ui)
{
extern void fib_urpf_list_bake(index_t urpf);
-extern u8 *format_fib_urpf_list(u8 *s, va_list ap);
+extern u8 *format_fib_urpf_list(u8 *s, va_list *ap);
extern void fib_urpf_list_show_mem(void);
static fib_walk_history_t fib_walk_history[HISTORY_N_WALKS];
u8*
-format_fib_walk_priority (u8 *s, va_list ap)
+format_fib_walk_priority (u8 *s, va_list *ap)
{
- fib_walk_priority_t prio = va_arg(ap, fib_walk_priority_t);
+ fib_walk_priority_t prio = va_arg(*ap, fib_walk_priority_t);
ASSERT(prio < FIB_WALK_PRIORITY_NUM);
return (format(s, "%s", fib_walk_priority_names[prio]));
}
static u8*
-format_fib_walk_queue_stats (u8 *s, va_list ap)
+format_fib_walk_queue_stats (u8 *s, va_list *ap)
{
- fib_walk_queue_stats_t wqs = va_arg(ap, fib_walk_queue_stats_t);
+ fib_walk_queue_stats_t wqs = va_arg(*ap, fib_walk_queue_stats_t);
ASSERT(wqs < FIB_WALK_QUEUE_STATS_NUM);
}
static u8*
-format_fib_walk (u8* s, va_list ap)
+format_fib_walk (u8* s, va_list *ap)
{
- fib_node_index_t fwi = va_arg(ap, fib_node_index_t);
+ fib_node_index_t fwi = va_arg(*ap, fib_node_index_t);
fib_walk_t *fwalk;
fwalk = fib_walk_get(fwi);
fib_node_index_t parent_index,
fib_node_back_walk_ctx_t *ctx);
-extern u8* format_fib_walk_priority(u8 *s, va_list ap);
+extern u8* format_fib_walk_priority(u8 *s, va_list *ap);
extern void fib_walk_process_enable(void);
extern void fib_walk_process_disable(void);
gre_header_t * h = va_arg (*args, gre_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
gre_protocol_t p = clib_net_to_host_u16 (h->protocol);
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
hdlc_header_t * h = va_arg (*args, hdlc_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
hdlc_protocol_t p = clib_net_to_host_u16 (h->protocol);
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
vnet_hw_interface_class_t *hw_class;
vnet_device_class_t *dev_class;
int verbose = va_arg (*args, int);
- uword indent;
+ u32 indent;
if (!hi)
return format (s, "%=32s%=6s%=8s%s", "Name", "Idx", "Link", "Hardware");
format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
vnet_sw_interface_t * si)
{
- uword indent, n_printed;
+ u32 indent, n_printed;
int i, j, n_counters;
static vnet_main_t **my_vnet_mains;
interface_output_trace_t *t = va_arg (*va, interface_output_trace_t *);
vnet_main_t *vnm = vnet_get_main ();
vnet_sw_interface_t *si;
- uword indent;
+ u32 indent;
if (t->sw_if_index != (u32) ~ 0)
{
ip4_header_t *ip = va_arg (*args, ip4_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
u32 ip_version, header_bytes;
- uword indent;
+ u32 indent;
/* Nothing to do. */
if (max_header_bytes < sizeof (ip[0]))
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U%U",
format_white_space, indent,
format_ip4_header, t->packet_data, sizeof (t->packet_data));
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
t->fib_index, t->dpo_index, t->flow_hash);
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "tx_sw_if_index %d dpo-idx %d : %U flow hash: 0x%08x",
t->fib_index, t->dpo_index, format_ip_adjacency,
u32 base_address = va_arg (*va, u32);
u32 ply_index = va_arg (*va, u32);
ip4_fib_mtrie_8_ply_t *p;
- uword indent;
+ u32 indent;
int i;
p = pool_elt_at_index (ip4_ply_pool, ply_index);
ip6_header_t *ip = va_arg (*args, ip6_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
u32 i, ip_version, traffic_class, flow_label;
- uword indent;
+ u32 indent;
/* Nothing to do. */
if (max_header_bytes < sizeof (ip[0]))
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U%U",
format_white_space, indent,
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x",
t->fib_index, t->adj_index, t->flow_hash);
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "tx_sw_if_index %d adj-idx %d : %U flow hash: 0x%08x",
t->fib_index, t->adj_index, format_ip_adjacency,
}
static u8 *
-format_lisp_fwd_path (u8 * s, va_list ap)
+format_lisp_fwd_path (u8 * s, va_list * ap)
{
- lisp_fwd_path_t *lfp = va_arg (ap, lisp_fwd_path_t *);
+ lisp_fwd_path_t *lfp = va_arg (*ap, lisp_fwd_path_t *);
s = format (s, "weight:%d ", lfp->weight);
s = format (s, "adj:[%U]\n",
static u8 *
-format_lisp_gpe_fwd_entry (u8 * s, va_list ap)
+format_lisp_gpe_fwd_entry (u8 * s, va_list * ap)
{
lisp_gpe_main_t *lgm = &lisp_gpe_main;
- lisp_gpe_fwd_entry_t *lfe = va_arg (ap, lisp_gpe_fwd_entry_t *);
+ lisp_gpe_fwd_entry_t *lfe = va_arg (*ap, lisp_gpe_fwd_entry_t *);
lisp_gpe_fwd_entry_format_flag_t flags =
- va_arg (ap, lisp_gpe_fwd_entry_format_flag_t);
+ va_arg (*ap, lisp_gpe_fwd_entry_format_flag_t);
s = format (s, "VNI:%d VRF:%d EID: %U -> %U [index:%d]",
lfe->key->vni, lfe->eid_table_id,
}
u8 *
-format_lisp_gpe_sub_interface (u8 * s, va_list ap)
+format_lisp_gpe_sub_interface (u8 * s, va_list * ap)
{
- lisp_gpe_sub_interface_t *l3s = va_arg (ap, lisp_gpe_sub_interface_t *);
+ lisp_gpe_sub_interface_t *l3s = va_arg (*ap, lisp_gpe_sub_interface_t *);
vnet_main_t *vnm = vnet_get_main ();
s = format (s, "%-16U",
eid_table_id,
u32 vni);
-extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list ap);
+extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list * ap);
extern void lisp_gpe_sub_interface_unlock (index_t itf);
* @brif Show/display one tenant
*/
static u8 *
-format_lisp_gpe_tenant (u8 * s, va_list ap)
+format_lisp_gpe_tenant (u8 * s, va_list * ap)
{
- const lisp_gpe_tenant_t *lt = va_arg (ap, lisp_gpe_tenant_t *);
+ const lisp_gpe_tenant_t *lt = va_arg (*ap, lisp_gpe_tenant_t *);
s = format (s, "VNI:%d ", lt->lt_vni);
llc_header_t *h = va_arg (*args, llc_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
llc_protocol_t p = h->dst_sap;
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = llc_header_length (h);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
}
static u8 *
-format_map_pre_resolve (u8 * s, va_list ap)
+format_map_pre_resolve (u8 * s, va_list * ap)
{
- map_main_pre_resolved_t *pr = va_arg (ap, map_main_pre_resolved_t *);
+ map_main_pre_resolved_t *pr = va_arg (*ap, map_main_pre_resolved_t *);
if (FIB_NODE_INDEX_INVALID != pr->fei)
{
}
u8*
-format_mfib_table_name (u8* s, va_list ap)
+format_mfib_table_name (u8* s, va_list *ap)
{
- fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
- fib_protocol_t proto = va_arg(ap, int); // int promotion
+ fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t);
+ fib_protocol_t proto = va_arg(*ap, int); // int promotion
mfib_table_t *mfib_table;
mfib_table = mfib_table_get(fib_index, proto);
* @brief
* Format the description/name of the table
*/
-extern u8* format_mfib_table_name(u8* s, va_list ap);
+extern u8* format_mfib_table_name(u8* s, va_list *ap);
/**
* @brief
static int
mfib_test_validate_rep_v (const replicate_t *rep,
u16 n_buckets,
- va_list ap)
+ va_list *ap)
{
const dpo_id_t *dpo;
adj_index_t ai;
for (bucket = 0; bucket < n_buckets; bucket++)
{
- dt = va_arg(ap, int); // type promotion
- ai = va_arg(ap, adj_index_t);
+ dt = va_arg(*ap, int); // type promotion
+ ai = va_arg(*ap, adj_index_t);
dpo = replicate_get_bucket_i(rep, bucket);
MFIB_TEST_REP((dt == dpo->dpoi_type),
format_mfib_prefix, &pfx,
format_dpo_type, tmp.dpoi_type);
- res = mfib_test_validate_rep_v(rep, n_buckets, ap);
+ res = mfib_test_validate_rep_v(rep, n_buckets, &ap);
dpo_reset(&tmp);
}
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "adj-idx %d : %U flow hash: 0x%08x",
t->adj_index,
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
mpls_adj_incomplete_trace_t * t;
- uword indent;
+ u32 indent;
t = va_arg (*args, mpls_adj_incomplete_trace_t *);
indent = format_get_indent (s);
osi_header_t *h = va_arg (*args, osi_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
osi_protocol_t p = h->protocol;
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
pg_main_t *pg = &pg_main;
pg_stream_t *stream;
vlib_node_t *n;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
stream = 0;
if (!pool_is_free_index (pg->streams, t->stream_index))
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
pg_output_trace_t *t = va_arg (*va, pg_output_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%Ubuffer 0x%x: %U",
format_white_space, indent,
ppp_header_t *h = va_arg (*args, ppp_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
ppp_protocol_t p = clib_net_to_host_u16 (h->protocol);
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
snap_header_t *h = va_arg (*args, snap_header_t *);
snap_protocol_info_t *pi = snap_get_protocol_info (sm, h);
u32 max_header_bytes = va_arg (*args, u32);
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
srp_and_ethernet_header_t * h = va_arg (*args, srp_and_ethernet_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
ethernet_main_t * em = ðernet_main;
- uword indent, header_bytes;
+ u32 indent, header_bytes;
header_bytes = sizeof (h[0]);
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
tcp_header_t *tcp = va_arg (*args, tcp_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
u32 header_bytes;
- uword indent;
+ u32 indent;
/* Nothing to do. */
if (max_header_bytes < sizeof (tcp[0]))
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U\n%U%U",
format_tcp_header, &t->tcp_header, 128,
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
tcp_tx_trace_t *t = va_arg (*args, tcp_tx_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U\n%U%U",
format_tcp_header, &t->tcp_header, 128,
{
udp_header_t *udp = va_arg (*args, udp_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
- uword indent;
+ u32 indent;
u32 header_bytes = sizeof (udp[0]);
/* Nothing to do. */
word fformat (FILE * f, char *fmt, ...);
word fdformat (int fd, char *fmt, ...);
-always_inline uword
+always_inline u32
format_get_indent (u8 * s)
{
- uword indent = 0;
+ u32 indent = 0;
u8 *nl;
if (!s)
graph_t *g = va_arg (*args, graph_t *);
graph_node_t *n;
graph_link_t *l;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "graph %d nodes", pool_elts (g->nodes));
/* *INDENT-OFF* */
{
mheap_t *h = va_arg (*va, mheap_t *);
mheap_stats_t *st = &h->stats;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s =
format (s,
{
/* Make a copy of traces since we'll be sorting them. */
mheap_trace_t *t, *traces_copy;
- uword indent, total_objects_traced;
+ u32 indent, total_objects_traced;
traces_copy = vec_dup (h->trace_main.traces);
qsort (traces_copy, vec_len (traces_copy), sizeof (traces_copy[0]),
/* Print short or long form depending on byte count. */
uword short_form = n_bytes <= 32;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (n_bytes == 0)
return s;
const int line_len = 16;
u8 *line_hex = 0;
u8 *line_str = 0;
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
if (!len)
return s;
{
timing_wheel_t *w = va_arg (*va, timing_wheel_t *);
int verbose = va_arg (*va, int);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "level 0: %.4e - %.4e secs, 2^%d - 2^%d clocks",
(f64) (1 << w->log2_clocks_per_bin) / w->cpu_clocks_per_second,
struct ethhdr * h = va_arg (*args, struct ethhdr *);
uword proto = h->h_proto;
u8 * payload = (void *) (h + 1);
- uword indent;
+ u32 indent;
/* Check for 802.2/802.3 encapsulation. */
if (proto < ETH_DATA_LEN)