From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 26E0841C26; Tue, 7 Feb 2023 01:20:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C98BF42D46; Tue, 7 Feb 2023 01:19:50 +0100 (CET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mails.dpdk.org (Postfix) with ESMTP id 42C4342D10 for ; Tue, 7 Feb 2023 01:19:46 +0100 (CET) Received: by mail-pj1-f42.google.com with SMTP id j1so7425143pjd.0 for ; Mon, 06 Feb 2023 16:19:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6zL2xjbD1mmWRggd1/eVrleId77cdCaSbEqFDtttXyo=; b=nPQfstGkctg9eDpUYiCgHPReGuI/+9s5SPX59Lv/0pFYCU/7L/iF9IZ7RqUdgH2XWH LFtUhE3sVSHwK+a9K4Rh7RE7AUp09N4hc9gXhcVUupi+7/s268wa9ZrFyT3ngQi2Wyob GSGR2c35vb+bbQfDP2VNvhqxPT57+zB1v5SMiRRQvDpQZAW6T69OMdTmLhee9w8p6D2G fiqNLAsL4rqGSjJ/gikVyAA8z1qo4+1rqzjEh+Zw7Z7V/+zkAOarzs6Si59VfNi+NR7q KhOl9MqSQGj+5MU37SwYiwxjTHFUrswwzZKrCT6TthnX9Gs7AAB4HAOJFTqOzYBX5I+v VXxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6zL2xjbD1mmWRggd1/eVrleId77cdCaSbEqFDtttXyo=; b=29b6QAznQ9NTaq+NvFe55Nwll2Kms5XvSIvhF1TT8Ufojc2bMo5Rg5I5b4l533JvJm elWx4I5Dw8UmUK8QcTwuls6LrbLIasyZuJyT3AcEwNymzApKvwufWY1BmBGAJRQOx6rp 6EpEHNkXg90ucsZe5YZXM8GkLLModzvvjwjkqHxOfJlKGFeC045dutgHim1fNraXh0wm LbRfnt+KHKnS7ayZZZVou9sahytVRqjGrIErtSYGr5jY3JNfcGe7hx4j5UfrOA3Xs0lH +Ky5holeIGcrcx+6XumBrDEvLi3FcEU7Q1BPioToL/b2gtCxtJqQRInnbSyO3zBZjybs ZaXg== X-Gm-Message-State: AO0yUKU0I9uqRu9w5e3R4QMxKMjzEYietOh2MIvsCVSJQ9J4+UGE/1pe 0a8ibQcY23PIygGYe5OFpgEHCRZ+tpWyN6Haeq0= X-Google-Smtp-Source: AK7set++1/F8TD+pyc6FZKneP52AFBE2UjdQKnWNAi9UzBRj361/GRKm89yTgENvVZC17SNdtA9S+w== X-Received: by 2002:a05:6a20:7d8f:b0:c0:1fcc:ca1f with SMTP id v15-20020a056a207d8f00b000c01fccca1fmr1270891pzj.39.1675729185163; Mon, 06 Feb 2023 16:19:45 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id o11-20020a637e4b000000b0046ff3634a78sm6617393pgn.71.2023.02.06.16.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 16:19:44 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Tyler Retzlaff , Vladimir Medvedkin Subject: [PATCH v2 6/8] rib: enable on Windows Date: Mon, 6 Feb 2023 16:19:35 -0800 Message-Id: <20230207001937.875608-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230207001937.875608-1-stephen@networkplumber.org> References: <20221201014440.11896-1-stephen@networkplumber.org> <20230207001937.875608-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The RIB library builds on Windows as long as sys/queue.h is included Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- app/test/test_rib.c | 19 ------------------- app/test/test_rib6.c | 24 ++---------------------- lib/rib/meson.build | 6 ------ lib/rib/rte_rib.c | 1 + lib/rib/rte_rib6.c | 1 + 5 files changed, 4 insertions(+), 47 deletions(-) diff --git a/app/test/test_rib.c b/app/test/test_rib.c index 06058f8f7c52..65b685641094 100644 --- a/app/test/test_rib.c +++ b/app/test/test_rib.c @@ -10,23 +10,6 @@ #include #include - -#ifdef RTE_EXEC_ENV_WINDOWS -static int -test_rib(void) -{ - printf("rib not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} - -static int -test_slow_rib(void) -{ - printf("slow_rib not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} -#else - #include typedef int32_t (*rte_rib_test)(void); @@ -380,7 +363,5 @@ test_slow_rib(void) return unit_test_suite_runner(&rib_slow_tests); } -#endif /* !RTE_EXEC_ENV_WINDOWS */ - REGISTER_TEST_COMMAND(rib_autotest, test_rib); REGISTER_TEST_COMMAND(rib_slow_autotest, test_slow_rib); diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c index ba79aedea5f7..336b779d2e1e 100644 --- a/app/test/test_rib6.c +++ b/app/test/test_rib6.c @@ -3,32 +3,14 @@ * Copyright(c) 2019 Intel Corporation */ -#include "test.h" - #include #include #include - #include - -#ifdef RTE_EXEC_ENV_WINDOWS -static int -test_rib6(void) -{ - printf("rib6 not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} - -static int -test_slow_rib6(void) -{ - printf("slow_rib6 not supported on Windows, skipping test\n"); - return TEST_SKIPPED; -} -#else - #include +#include "test.h" + typedef int32_t (*rte_rib6_test)(void); static int32_t test_create_invalid(void); @@ -385,7 +367,5 @@ test_slow_rib6(void) return unit_test_suite_runner(&rib6_slow_tests); } -#endif /* !RTE_EXEC_ENV_WINDOWS */ - REGISTER_TEST_COMMAND(rib6_autotest, test_rib6); REGISTER_TEST_COMMAND(rib6_slow_autotest, test_slow_rib6); diff --git a/lib/rib/meson.build b/lib/rib/meson.build index bda7f576e976..7bacbb453592 100644 --- a/lib/rib/meson.build +++ b/lib/rib/meson.build @@ -2,12 +2,6 @@ # Copyright(c) 2018 Vladimir Medvedkin # Copyright(c) 2019 Intel Corporation -if is_windows - build = false - reason = 'not supported on Windows' - subdir_done() -endif - sources = files('rte_rib.c', 'rte_rib6.c') headers = files('rte_rib.h', 'rte_rib6.h') deps += ['mempool'] diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c index b0794edf66f5..812a2597d117 100644 --- a/lib/rib/rte_rib.c +++ b/lib/rib/rte_rib.c @@ -5,6 +5,7 @@ #include #include +#include #include #include diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c index 19e4ff97c479..ae44281ae105 100644 --- a/lib/rib/rte_rib6.c +++ b/lib/rib/rte_rib6.c @@ -5,6 +5,7 @@ #include #include +#include #include #include -- 2.39.1