On Wed, Oct 31, 2018 at 10:02:05PM -0400, David Higgs wrote:
> On Wed, Oct 31, 2018 at 6:58 PM Sebastian Benoit <be...@openbsd.org> wrote:
>
> <snip>
>
> On a phone, saw some typos and such, sorry no diff.
>
> [benoit@border2:~]$ cat before
> > RDE memory statistics
> > 715727 IPv4 unicast network entries using 27.3M of memory
> > 58953 IPv6 unicast network entries using 3.1M of memory
> > 1549171 rib entries using 94.6M of memory
> > 2897130 prefix entries using 265M of memory
> > 562423 BGP path attribute entries using 60.1M of memory
> > 149579 BGP AS-PATH attribute entries using 6.1M of memory,
> > and holding 562423 references
> > 37007 BGP attributes entries using 1.4M of memory
> > and holding 880668 references
>
>
> Inconsistent comma usage above
>
This one was fixed in a recent commit. It seems benno@ has not updated bgpctl :)
>
> > 37006 BGP attributes using 912K of memory
> > 61964 as-set elements in 58064 tables using 950K of memory
> > 103150 prefix-set elments using 4.3M of memory
>
>
> elments => elements
>
> RIB using 459M of memory
> > Sets using 5.2M of memory
> >
> > RDE hash statistics
> > path hash: size 131072, 562423 entires
> > min 0 max 20 avg/std-dev = 4.291/2.364
> > aspath hash: size 131072, 149579 entires
> > min 0 max 8 avg/std-dev = 1.141/0.835
> > attr hash: size 16384, 37007 entires
> > min 0 max 10 avg/std-dev = 2.259/1.378
> >
>
> entires => entries
>
Thanks for spotting.
> —david
Index: bgpctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpctl/bgpctl.c,v
retrieving revision 1.222
diff -u -p -r1.222 bgpctl.c
--- bgpctl.c 31 Oct 2018 14:58:59 -0000 1.222
+++ bgpctl.c 1 Nov 2018 08:17:21 -0000
@@ -1880,7 +1880,7 @@ show_rib_memory_msg(struct imsg *imsg)
printf("%10lld as-set elements in %lld tables using "
"%s of memory\n", stats.aset_nmemb, stats.aset_cnt,
fmt_mem(stats.aset_size));
- printf("%10lld prefix-set elments using %s of memory\n",
+ printf("%10lld prefix-set elements using %s of memory\n",
stats.pset_cnt, fmt_mem(stats.pset_size));
printf("RIB using %s of memory\n", fmt_mem(pts +
stats.prefix_cnt * sizeof(struct prefix) +
@@ -1894,7 +1894,7 @@ show_rib_memory_msg(struct imsg *imsg)
break;
case IMSG_CTL_SHOW_RIB_HASH:
memcpy(&hash, imsg->data, sizeof(hash));
- printf("\t%s: size %lld, %lld entires\n", hash.name, hash.num,
+ printf("\t%s: size %lld, %lld entries\n", hash.name, hash.num,
hash.sum);
avg = (double)hash.sum / (double)hash.num;
dev = sqrt(fmax(0, hash.sumq / hash.num - avg * avg));
