summaryrefslogtreecommitdiffstats
path: root/ripngd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2022-10-04 18:44:36 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2022-10-26 18:12:34 +0200
commit89cb86aeb0262e17ee39c1d791effe9515bd0dc8 (patch)
treea1643fa620a97ffdc2da9442abd7cff29d86e434 /ripngd
parentMerge pull request #11673 from cscarpitta/srv6-per-vrf-sid (diff)
downloadfrr-89cb86aeb0262e17ee39c1d791effe9515bd0dc8.tar.xz
frr-89cb86aeb0262e17ee39c1d791effe9515bd0dc8.zip
build, vtysh: extract vtysh commands from .xref
Rather than running selected source files through the preprocessor and a bunch of perl regex'ing to get the list of all DEFUNs, use the data collected in frr.xref. This not only eliminates issues we've been having with preprocessor failures due to nonexistent header files, but is also much faster. Where extract.pl would take 5s, this now finishes in 0.2s. And since this is a non-parallelizable build step towards the end of the build (dependent on a lot of other things being done already), the speedup is actually noticeable. Also files containing CLI no longer need to be listed in `vtysh_scan` since the .xref data covers everything. `#ifndef VTYSH_EXTRACT_PL` checks are equally obsolete. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ripngd')
-rw-r--r--ripngd/ripng_cli.c2
-rw-r--r--ripngd/subdir.am5
2 files changed, 0 insertions, 7 deletions
diff --git a/ripngd/ripng_cli.c b/ripngd/ripng_cli.c
index ded2f4358..049a392dd 100644
--- a/ripngd/ripng_cli.c
+++ b/ripngd/ripng_cli.c
@@ -30,9 +30,7 @@
#include "ripngd/ripngd.h"
#include "ripngd/ripng_nb.h"
-#ifndef VTYSH_EXTRACT_PL
#include "ripngd/ripng_cli_clippy.c"
-#endif
/*
* XPath: /frr-ripngd:ripngd/instance
diff --git a/ripngd/subdir.am b/ripngd/subdir.am
index a4db3e5a6..162426c58 100644
--- a/ripngd/subdir.am
+++ b/ripngd/subdir.am
@@ -4,11 +4,6 @@
if RIPNGD
sbin_PROGRAMS += ripngd/ripngd
-vtysh_scan += \
- ripngd/ripng_cli.c \
- ripngd/ripng_debug.c \
- ripngd/ripngd.c \
- # end
vtysh_daemons += ripngd
man8 += $(MANBUILD)/frr-ripngd.8
endif