From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 2 Mar 2016 20:04:51 +0000 (-0500)
Subject: bgpd: Remove expensive prefix count from json.
X-Git-Tag: frr-2.0-rc1~1080
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=91bce9882c8681746eb09b93f27152a8885d0eaa;p=mirror%2Ffrr.git

bgpd: Remove expensive prefix count from json.

'show bgp ipv4 uni summ' is counting each prefix sent
to each neighbor.  At scale this is an expensive
operation.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 21a651b6ea..5c233b2cf3 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8300,23 +8300,6 @@ DEFUN (show_bgp_memory,
   return CMD_SUCCESS;
 }
 
-static int
-bgp_adj_out_count (struct peer *peer, int afi, int safi)
-{
-  struct bgp_table *table;
-  struct bgp_node *rn;
-  int count = 0;
-
-  if (!peer) return(0);
-
-  table = peer->bgp->rib[afi][safi];
-  if (!table) return(0);
-  for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn))
-    if (bgp_adj_out_lookup(peer, rn, 0))
-	count++;
-  return (count);
-}
-
 /* Show BGP peer's summary information. */
 static int
 bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
@@ -8528,7 +8511,6 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
               json_object_int_add(json_peer, "inq", 0);
               peer_uptime (peer->uptime, timebuf, BGP_UPTIME_LEN, use_json, json_peer);
               json_object_int_add(json_peer, "prefixReceivedCount", peer->pcount[afi][safi]);
-              json_object_int_add(json_peer, "prefixAdvertisedCount", bgp_adj_out_count(peer, afi, safi));
 
               if (CHECK_FLAG (peer->flags, PEER_FLAG_SHUTDOWN))
                 json_object_string_add(json_peer, "state", "Idle (Admin)");