The FIB library builds on Windows as long as sys/queue.h is defined.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
app/test/test_fib.c | 22 +---------------------
app/test/test_fib6.c | 24 ++----------------------
app/test/test_fib6_perf.c | 15 +--------------
app/test/test_fib_perf.c | 19 +++----------------
lib/fib/meson.build | 6 ------
lib/fib/rte_fib.c | 1 +
lib/fib/rte_fib6.c | 1 +
7 files changed, 9 insertions(+), 79 deletions(-)
diff --git a/app/test/test_fib.c b/app/test/test_fib.c
index a2d1ea8f3abc..eb69d6e2fd4c 100644
--- a/app/test/test_fib.c
+++ b/app/test/test_fib.c
@@ -9,28 +9,10 @@
#include <rte_ip.h>
#include <rte_log.h>
+#include <rte_fib.h>
#include "test.h"
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_fib(void)
-{
- printf("fib not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-static int
-test_slow_fib(void)
-{
- printf("slow_fib not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-#else
-
-#include <rte_fib.h>
-
typedef int32_t (*rte_fib_test)(void);
static int32_t test_create_invalid(void);
@@ -433,7 +415,5 @@ test_slow_fib(void)
return unit_test_suite_runner(&fib_slow_tests);
}
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
REGISTER_TEST_COMMAND(fib_autotest, test_fib);
REGISTER_TEST_COMMAND(fib_slow_autotest, test_slow_fib);
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index cd971e6ecdfb..15ad09178ae2 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -9,29 +9,11 @@
#include <rte_memory.h>
#include <rte_log.h>
-
-#include "test.h"
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_fib6(void)
-{
- printf("fib not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-static int
-test_slow_fib6(void)
-{
- printf("slow_fib not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-#else
-
#include <rte_rib6.h>
#include <rte_fib6.h>
+#include "test.h"
+
typedef int32_t (*rte_fib6_test)(void);
static int32_t test_create_invalid(void);
@@ -442,7 +424,5 @@ test_slow_fib6(void)
return unit_test_suite_runner(&fib6_slow_tests);
}
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
REGISTER_TEST_COMMAND(fib6_autotest, test_fib6);
REGISTER_TEST_COMMAND(fib6_slow_autotest, test_slow_fib6);
diff --git a/app/test/test_fib6_perf.c b/app/test/test_fib6_perf.c
index 21d2b65318e9..add20c2331b1 100644
--- a/app/test/test_fib6_perf.c
+++ b/app/test/test_fib6_perf.c
@@ -10,21 +10,10 @@
#include <rte_cycles.h>
#include <rte_random.h>
#include <rte_memory.h>
+#include <rte_fib6.h>
#include "test.h"
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_fib6_perf(void)
-{
- printf("fib6_perf not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-#else
-
-#include <rte_fib6.h>
-
#include "test_lpm6_data.h"
#define TEST_FIB_ASSERT(cond) do { \
@@ -167,6 +156,4 @@ test_fib6_perf(void)
return 0;
}
-#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/
-
REGISTER_TEST_COMMAND(fib6_perf_autotest, test_fib6_perf);
diff --git a/app/test/test_fib_perf.c b/app/test/test_fib_perf.c
index 9787874cc9b7..b56293e64f41 100644
--- a/app/test/test_fib_perf.c
+++ b/app/test/test_fib_perf.c
@@ -12,22 +12,11 @@
#include <rte_random.h>
#include <rte_branch_prediction.h>
#include <rte_ip.h>
+#include <rte_fib.h>
#include "test.h"
#include "test_xmmt_ops.h"
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_fib_perf(void)
-{
- printf("fib_perf not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-#else
-
-#include <rte_fib.h>
-
#define TEST_FIB_ASSERT(cond) do { \
if (!(cond)) { \
printf("Error at line %d:\n", __LINE__); \
@@ -246,7 +235,7 @@ static void generate_random_rule_prefix(uint32_t ip_class,
uint8_t depth)
/* Only generate rest bits except the most significant
* fixed bits for IP address class
*/
- start = lrand48() & mask;
+ start = rte_rand() & mask;
ptr_rule = &large_route_table[num_route_entries];
for (k = 0; k < rule_num; k++) {
ptr_rule->ip = (start << (RTE_FIB_MAX_DEPTH - depth))
@@ -265,7 +254,7 @@ static void insert_rule_in_random_pos(uint32_t ip, uint8_t
depth)
struct route_rule tmp;
do {
- pos = lrand48();
+ pos = rte_rand();
try_count++;
} while ((try_count < 10) && (pos > num_route_entries));
@@ -420,6 +409,4 @@ test_fib_perf(void)
return 0;
}
-#endif /* !RTE_EXEC_ENV_WINDOWS */
-
REGISTER_TEST_COMMAND(fib_perf_autotest, test_fib_perf);
diff --git a/lib/fib/meson.build b/lib/fib/meson.build
index 9b848d08417c..ddcae0617a73 100644
--- a/lib/fib/meson.build
+++ b/lib/fib/meson.build
@@ -2,12 +2,6 @@
# Copyright(c) 2018 Vladimir Medvedkin <medvedk...@gmail.com>
# Copyright(c) 2019 Intel Corporation
-if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
-endif
-
sources = files('rte_fib.c', 'rte_fib6.c', 'dir24_8.c', 'trie.c')
headers = files('rte_fib.h', 'rte_fib6.h')
deps += ['rib']
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 8af4c4091908..0c3b20e00a5a 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -5,6 +5,7 @@
#include <stdint.h>
#include <string.h>
+#include <sys/queue.h>
#include <rte_eal_memconfig.h>
#include <rte_errno.h>
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index 4b8e22b142b9..28c69b38999f 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -5,6 +5,7 @@
#include <stdint.h>
#include <string.h>
+#include <sys/queue.h>
#include <rte_eal_memconfig.h>
#include <rte_tailq.h>
--
2.39.1
