test: resolve name collision on Windows

[dpdk.git] / app / test / test_efd.c

diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index e3e5e30..1b249e0 100644 (file)
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -32,12 +32,7 @@ struct flow_key {
        uint8_t proto;
 } __rte_packed;
 
-int efd_logtype_test;
-
-RTE_INIT(test_efd_init_log)
-{
-       efd_logtype_test = rte_log_register("test.efd");
-}
+RTE_LOG_REGISTER(efd_logtype_test, test.efd, INFO);
 
 /*
  * Print out result of unit test efd operation.
@@ -96,11 +91,11 @@ static struct flow_key keys[5] = {
 /* Array to store the data */
 static efd_value_t data[5];
 
-static inline uint8_t efd_get_all_sockets_bitmask(void)
+static inline uint64_t efd_get_all_sockets_bitmask(void)
 {
-       uint8_t all_cpu_sockets_bitmask = 0;
+       uint64_t all_cpu_sockets_bitmask = 0;
        unsigned int i;
-       unsigned int next_lcore = rte_get_master_lcore();
+       unsigned int next_lcore = rte_get_main_lcore();
        const int val_true = 1, val_false = 0;
        for (i = 0; i < rte_lcore_count(); i++) {
                all_cpu_sockets_bitmask |= 1 << rte_lcore_to_socket_id(next_lcore);
@@ -448,6 +443,7 @@ static int test_efd_creation_with_bad_parameters(void)
 static int
 test_efd(void)
 {
+       test_socket_id = rte_socket_id();
 
        /* Unit tests */
        if (test_add_delete() < 0)