IMSG_CTL_SHOW_RIB_HASH is no longer used, GC it.
Also kill some global hash sizes which are not used anymore.
--
:wq Claudio
Index: bgpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.h,v
retrieving revision 1.451
diff -u -p -r1.451 bgpd.h
--- bgpd.h 29 Aug 2022 18:18:55 -0000 1.451
+++ bgpd.h 31 Aug 2022 15:04:11 -0000
@@ -547,7 +547,6 @@ enum imsg_type {
IMSG_CTL_SHOW_RIB_ATTR,
IMSG_CTL_SHOW_NETWORK,
IMSG_CTL_SHOW_RIB_MEM,
- IMSG_CTL_SHOW_RIB_HASH,
IMSG_CTL_SHOW_TERSE,
IMSG_CTL_SHOW_TIMER,
IMSG_CTL_LOG_VERBOSE,
@@ -1206,15 +1205,6 @@ struct rde_memstats {
long long aset_nmemb;
long long pset_cnt;
long long pset_size;
-};
-
-struct rde_hashstats {
- char name[16];
- long long num;
- long long min;
- long long max;
- long long sum;
- long long sumq;
};
#define MRT_FILE_LEN 512
Index: rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.c,v
retrieving revision 1.572
diff -u -p -r1.572 rde.c
--- rde.c 31 Aug 2022 14:29:36 -0000 1.572
+++ rde.c 31 Aug 2022 14:30:53 -0000
@@ -146,9 +146,6 @@ rde_sighdlr(int sig)
}
uint32_t peerhashsize = 1024;
-uint32_t pathhashsize = 128 * 1024;
-uint32_t attrhashsize = 16 * 1024;
-uint32_t nexthophashsize = 1024;
void
rde_main(int debug, int verbose)
@@ -626,8 +623,6 @@ badnetdel:
case IMSG_CTL_SHOW_RIB_MEM:
imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_RIB_MEM, 0,
imsg.hdr.pid, -1, &rdemem, sizeof(rdemem));
- imsg_compose(ibuf_se_ctl, IMSG_CTL_END, 0, imsg.hdr.pid,
- -1, NULL, 0);
break;
case IMSG_CTL_SHOW_SET:
/* first roa set */
Index: session.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/session.c,v
retrieving revision 1.434
diff -u -p -r1.434 session.c
--- session.c 26 Aug 2022 14:10:52 -0000 1.434
+++ session.c 31 Aug 2022 14:42:46 -0000
@@ -3141,7 +3141,6 @@ session_dispatch_imsg(struct imsgbuf *ib
case IMSG_CTL_SHOW_RIB_COMMUNITIES:
case IMSG_CTL_SHOW_RIB_ATTR:
case IMSG_CTL_SHOW_RIB_MEM:
- case IMSG_CTL_SHOW_RIB_HASH:
case IMSG_CTL_SHOW_NETWORK:
case IMSG_CTL_SHOW_NEIGHBOR:
case IMSG_CTL_SHOW_SET: