diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-10-04 18:44:36 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-10-26 18:12:34 +0200 |
| commit | 89cb86aeb0262e17ee39c1d791effe9515bd0dc8 (patch) | |
| tree | a1643fa620a97ffdc2da9442abd7cff29d86e434 /eigrpd | |
| parent | Merge pull request #11673 from cscarpitta/srv6-per-vrf-sid (diff) | |
| download | frr-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 'eigrpd')
| -rw-r--r-- | eigrpd/eigrp_cli.c | 2 | ||||
| -rw-r--r-- | eigrpd/eigrp_vty.c | 2 | ||||
| -rw-r--r-- | eigrpd/subdir.am | 6 |
3 files changed, 0 insertions, 10 deletions
diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c index 744f5f9c7..2afd9d5ea 100644 --- a/eigrpd/eigrp_cli.c +++ b/eigrpd/eigrp_cli.c @@ -31,9 +31,7 @@ #include "eigrp_zebra.h" #include "eigrp_cli.h" -#ifndef VTYSH_EXTRACT_PL #include "eigrpd/eigrp_cli_clippy.c" -#endif /* VTYSH_EXTRACT_PL */ /* * XPath: /frr-eigrpd:eigrpd/instance diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index 3d61294b2..137f9b028 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -55,9 +55,7 @@ #include "eigrpd/eigrp_dump.h" #include "eigrpd/eigrp_const.h" -#ifndef VTYSH_EXTRACT_PL #include "eigrpd/eigrp_vty_clippy.c" -#endif static void eigrp_vty_display_prefix_entry(struct vty *vty, struct eigrp *eigrp, struct eigrp_prefix_descriptor *pe, diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am index 3b647e060..e417132b5 100644 --- a/eigrpd/subdir.am +++ b/eigrpd/subdir.am @@ -4,12 +4,6 @@ if EIGRPD sbin_PROGRAMS += eigrpd/eigrpd -vtysh_scan += \ - eigrpd/eigrp_cli.c \ - eigrpd/eigrp_dump.c \ - eigrpd/eigrp_vty.c \ - # end -# eigrpd/eigrp_routemap.c vtysh_daemons += eigrpd man8 += $(MANBUILD)/frr-eigrpd.8 endif |