mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-09 20:58:44 +00:00
Merge commit 'd3f50ede127df338f575e188566035b2a46cf6c6' into thread-next
This commit is contained in:
commit
5481bcd82f
11
configure.ac
11
configure.ac
@ -36,6 +36,12 @@ AC_ARG_ENABLE([memcheck],
|
||||
[enable_memcheck=yes]
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE([compact-tries],
|
||||
[AS_HELP_STRING([--enable-compact-tries], [use 4-way tries instead of 16-way ones @<:@no@:>@])],
|
||||
[],
|
||||
[enable_compact_tries=no]
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE([libssh],
|
||||
[AS_HELP_STRING([--enable-libssh], [enable LibSSH support in RPKI @<:@try@:>@])],
|
||||
[],
|
||||
@ -415,6 +421,10 @@ if test "$enable_debug" = yes ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$enable_compact_tries" = yes ; then
|
||||
AC_DEFINE([ENABLE_COMPACT_TRIES], [1], [Define to 1 if you want 4-way tries instead of 16-way ones.])
|
||||
fi
|
||||
|
||||
CLIENT=birdcl
|
||||
CLIENT_LIBS=
|
||||
if test "$enable_client" = yes ; then
|
||||
@ -475,6 +485,7 @@ AC_MSG_RESULT([ Object directory: $objdir])
|
||||
AC_MSG_RESULT([ Iproute2 directory: $iproutedir])
|
||||
AC_MSG_RESULT([ System configuration: $sysdesc])
|
||||
AC_MSG_RESULT([ Debugging: $enable_debug])
|
||||
AC_MSG_RESULT([ Compact tries: $enable_compact_tries])
|
||||
AC_MSG_RESULT([ Routing protocols: $protocols])
|
||||
AC_MSG_RESULT([ LibSSH support in RPKI: $enable_libssh])
|
||||
AC_MSG_RESULT([ Kernel MPLS support: $enable_mpls_kernel])
|
||||
|
@ -68,8 +68,15 @@ struct f_tree {
|
||||
void *data;
|
||||
};
|
||||
|
||||
#ifdef ENABLE_COMPACT_TRIES
|
||||
/* Compact 4-way tries */
|
||||
#define TRIE_STEP 2
|
||||
#define TRIE_STACK_LENGTH 65
|
||||
#else
|
||||
/* Faster 16-way tries */
|
||||
#define TRIE_STEP 4
|
||||
#define TRIE_STACK_LENGTH 33
|
||||
#endif
|
||||
|
||||
struct f_trie_node4
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user