Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
stats: Split stat_segment and stats code in preparation for deprecation.
[vpp.git]
/
src
/
vpp
/
api
/
api.c
diff --git
a/src/vpp/api/api.c
b/src/vpp/api/api.c
index
8bb11c9
..
d69b84f
100644
(file)
--- a/
src/vpp/api/api.c
+++ b/
src/vpp/api/api.c
@@
-56,7
+56,7
@@
#undef BIHASH_TYPE
#undef __included_bihash_template_h__
#undef BIHASH_TYPE
#undef __included_bihash_template_h__
-#include <v
pp/stats/stats
.h>
+#include <v
net/ip/format
.h>
#include <vpp/api/vpe_msg_enum.h>
#include <vpp/api/vpe_msg_enum.h>
@@
-367,7
+367,8
@@
vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
vlib_main_t *vm = vlib_get_main ();
void *oldheap;
vl_api_get_node_graph_reply_t *rmp;
vlib_main_t *vm = vlib_get_main ();
void *oldheap;
vl_api_get_node_graph_reply_t *rmp;
- vlib_node_t ***node_dups;
+ static vlib_node_t ***node_dups;
+ static vlib_main_t **stat_vms;
pthread_mutex_lock (&am->vlib_rp->mutex);
oldheap = svm_push_data_heap (am->vlib_rp);
pthread_mutex_lock (&am->vlib_rp->mutex);
oldheap = svm_push_data_heap (am->vlib_rp);
@@
-378,9
+379,10
@@
vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
vec_validate (vector, 16384);
vec_reset_length (vector);
vec_validate (vector, 16384);
vec_reset_length (vector);
- /* $$$$ FIXME */
- node_dups = vlib_node_get_nodes (vm, (u32) ~ 0 /* all threads */ ,
- 1 /* include stats */ );
+ vlib_node_get_nodes (vm, 0 /* main threads */ ,
+ 0 /* include stats */ ,
+ 1 /* barrier sync */ ,
+ &node_dups, &stat_vms);
vector = vlib_node_serialize (vm, node_dups, vector, 1 /* include nexts */ ,
1 /* include stats */ );
vector = vlib_node_serialize (vm, node_dups, vector, 1 /* include nexts */ ,
1 /* include stats */ );
@@
-430,7
+432,7
@@
static void setup_message_id_table (api_main_t * am);
/*
* vpe_api_hookup
* Add vpe's API message handlers to the table.
/*
* vpe_api_hookup
* Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has alread
y
mapped shared memory and
* added the client registration handlers.
* See .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
*/
* added the client registration handlers.
* See .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
*/
@@
-472,7
+474,7
@@
vpe_api_hookup (vlib_main_t * vm)
VLIB_API_INIT_FUNCTION (vpe_api_hookup);
VLIB_API_INIT_FUNCTION (vpe_api_hookup);
-
static
clib_error_t *
+clib_error_t *
vpe_api_init (vlib_main_t * vm)
{
vpe_api_main_t *am = &vpe_api_main;
vpe_api_init (vlib_main_t * vm)
{
vpe_api_main_t *am = &vpe_api_main;
@@
-490,9
+492,6
@@
vpe_api_init (vlib_main_t * vm)
return 0;
}
return 0;
}
-VLIB_INIT_FUNCTION (vpe_api_init);
-
-
static clib_error_t *
api_segment_config (vlib_main_t * vm, unformat_input_t * input)
{
static clib_error_t *
api_segment_config (vlib_main_t * vm, unformat_input_t * input)
{