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 /staticd | |
| 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 'staticd')
| -rw-r--r-- | staticd/static_vty.c | 2 | ||||
| -rw-r--r-- | staticd/subdir.am | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/staticd/static_vty.c b/staticd/static_vty.c index c0638f4bc..94a349347 100644 --- a/staticd/static_vty.c +++ b/staticd/static_vty.c @@ -36,9 +36,7 @@ #include "static_vty.h" #include "static_routes.h" #include "static_debug.h" -#ifndef VTYSH_EXTRACT_PL #include "staticd/static_vty_clippy.c" -#endif #include "static_nb.h" #define STATICD_STR "Static route daemon\n" diff --git a/staticd/subdir.am b/staticd/subdir.am index 62969a0a2..bb0fc95bc 100644 --- a/staticd/subdir.am +++ b/staticd/subdir.am @@ -5,7 +5,6 @@ if STATICD noinst_LIBRARIES += staticd/libstatic.a sbin_PROGRAMS += staticd/staticd -vtysh_scan += staticd/static_vty.c vtysh_daemons += staticd man8 += $(MANBUILD)/frr-staticd.8 endif |