Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

lib, bgpd: Add ability to specify that some json output should not be pretty 

Initial commit: 23b2a7ef52
changed the json output of `show bgp <afi> <safi> json` to
not have pretty print because when under a situation where
there are a bunch of routes with a large scale ecmp show
output was taking forever and this commit cut 2 minutes out
of vtysh run time.

Subusequent commit: f4ec52f7cc
changed this back.

When upgrading to latest version the long run time was noticed
due to testing.  Let's add back this functionality such that
FRR can have reduced run times with vtysh when it's really
needed.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-02-02 10:28:19 -05:00
parent 7461589c2e
commit d7c6467ba2
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_route.c
View File

@ -11588,7 +11588,16 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
else
vty_out(vty, ",\"%pFX\": ", dest_p);
}
vty_json(vty, json_paths);
/*
* We are using no_pretty here because under
* extremely high settings( say lots and lots of
* routes with lots and lots of ways to reach
* that route via different paths ) this can
* save several minutes of output when FRR
* is run on older cpu's or more underperforming
* routers out there
*/
vty_json_no_pretty(vty, json_paths);
json_paths = NULL;
first = 0;
} else

15
lib/vty.c
View File

@ -284,7 +284,8 @@ done:
return len;
}
int vty_json(struct vty *vty, struct json_object *json)
static int vty_json_helper(struct vty *vty, struct json_object *json,
uint32_t options)
{
const char *text;
@ -299,6 +300,18 @@ int vty_json(struct vty *vty, struct json_object *json)
return CMD_SUCCESS;
}
int vty_json(struct vty *vty, struct json_object *json)
{
return vty_json_helper(vty, json,
JSON_C_TO_STRING_PRETTY |
JSON_C_TO_STRING_NOSLASHESCAPE);
}
int vty_json_no_pretty(struct vty *vty, struct json_object *json)
{
return vty_json_helper(vty, json, JSON_C_TO_STRING_NOSLASHESCAPE);
}
/* Output current time to the vty. */
void vty_time_print(struct vty *vty, int cr)
{

4
lib/vty.h
View File

@ -353,8 +353,12 @@ extern void vty_endframe(struct vty *, const char *);
extern bool vty_set_include(struct vty *vty, const char *regexp);
/* returns CMD_SUCCESS so you can do a one-line "return vty_json(...)"
* NULL check and json_object_free() is included.
*
* _no_pretty means do not add a bunch of newlines and dump the output
* as densely as possible.
*/
extern int vty_json(struct vty *vty, struct json_object *json);
extern int vty_json_no_pretty(struct vty *vty, struct json_object *json);
/* post fd to be passed to the vtysh client
* fd is owned by the VTY code after this and will be closed when done