diff options
| author |   Dave Barach <dave@barachs.net> | 2018-06-13 09:26:05 -0400 |
|---|---|---|
| committer | Dave Barach <dave@barachs.net> | 2018-06-13 09:26:41 -0400 |
| commit | 1ddbc0138b64486b8e51e5e12fcad21fba8b8b68 (patch) | |
| tree | af95c33e6e1681498a49b130119103b60f64db08 /src/vat | |
| parent | c7d50970d4ed8a4889b4374e6a1559aef7d3dcc0 (diff) | |
Stat segment / client: show run" works now
Seems to have minimal-to-zero performance consequences. Data appears
accurate: result match the debug CLI output. Checked at low rates, 27
MPPS sprayed across two worker threads.
Change-Id: I09ede5150b88a91547feeee448a2854997613004
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vat')
| -rw-r--r-- | src/vat/api_format.c | 19 | ||||
| -rw-r--r-- | src/vat/vat.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 635b4ef72ba..b9f08048651 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -3088,13 +3088,14 @@ static void vl_api_get_node_graph_reply_t_handler { hash_free (vam->graph_node_index_by_name); - for (i = 0; i < vec_len (vam->graph_nodes); i++) + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) { - node = vam->graph_nodes[i]; + node = vam->graph_nodes[0][i]; vec_free (node->name); vec_free (node->next_nodes); vec_free (node); } + vec_free (vam->graph_nodes[0]); vec_free (vam->graph_nodes); } @@ -3102,9 +3103,9 @@ static void vl_api_get_node_graph_reply_t_handler vam->graph_nodes = vlib_node_unserialize (pvt_copy); vec_free (pvt_copy); - for (i = 0; i < vec_len (vam->graph_nodes); i++) + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) { - node = vam->graph_nodes[i]; + node = vam->graph_nodes[0][i]; hash_set_mem (vam->graph_node_index_by_name, node->name, i); } } @@ -23389,15 +23390,15 @@ dump_node_table (vat_main_t * vam) return 0; } - for (i = 0; i < vec_len (vam->graph_nodes); i++) + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) { - node = vam->graph_nodes[i]; + node = vam->graph_nodes[0][i]; print (vam->ofp, "[%d] %s", i, node->name); for (j = 0; j < vec_len (node->next_nodes); j++) { if (node->next_nodes[j] != ~0) { - next_node = vam->graph_nodes[node->next_nodes[j]]; + next_node = vam->graph_nodes[0][node->next_nodes[j]]; print (vam->ofp, " [%d] %s", j, next_node->name); } } @@ -23492,13 +23493,13 @@ search_node_table (vat_main_t * vam) print (vam->ofp, "%s not found...", node_to_find); goto out; } - node = vam->graph_nodes[p[0]]; + node = vam->graph_nodes[0][p[0]]; print (vam->ofp, "[%d] %s", p[0], node->name); for (j = 0; j < vec_len (node->next_nodes); j++) { if (node->next_nodes[j] != ~0) { - next_node = vam->graph_nodes[node->next_nodes[j]]; + next_node = vam->graph_nodes[0][node->next_nodes[j]]; print (vam->ofp, " [%d] %s", j, next_node->name); } } diff --git a/src/vat/vat.h b/src/vat/vat.h index 19796b92ef3..c9384a1ce57 100644 --- a/src/vat/vat.h +++ b/src/vat/vat.h @@ -129,7 +129,7 @@ typedef struct /* Graph node table */ uword *graph_node_index_by_name; - vlib_node_t **graph_nodes; + vlib_node_t ***graph_nodes; /* ip tables */ ip_details_t *ip_details_by_sw_if_index[2]; |