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 9E03841CE2; Sun, 19 Feb 2023 18:50:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A4B642D56; Sun, 19 Feb 2023 18:50:28 +0100 (CET) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mails.dpdk.org (Postfix) with ESMTP id 8DC6742D39 for ; Sun, 19 Feb 2023 18:50:22 +0100 (CET) Received: by mail-pj1-f52.google.com with SMTP id d4so989919pjc.5 for ; Sun, 19 Feb 2023 09:50:22 -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=gIn+W4zHH9tB2K9xWGA/MnytUIyu0Fh/qvdLzzBjiRYKOXfmSVqpijLcq/4qq7kAOG rYDBx2HtRl0LYbVdAgNTP/mdkim/wBt3AT+/fiR4vZrYsC496NICjsQY2A6MJ6ed1CoI +t+4GIh3hjtJDSl8rGwC2K4+wQ6f3RIpdPegm1VyeS2R/FvSBk2FBjkj0K/7TkNGPoOl G+laO8g+BdqArBOyjcSj1rfNAfsTgmnBI1CfAZouGRXnkEU/5EEQsxH/A/Oh0kw9Yad5 8RH2KnUuRMhb3hR8IrIoO9Rm+3xBIOmsCgLM6wXPAWQhIGSPp5mkURrB0bfcZT1zMdFF FFqw== 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=fHIC3w+CW1Hj+q0F19Vq7qCC3009UV0ZPUsyfrENMdy2hTLzynDgVO6oWoFXt5cKF2 RWDkTXTFKN/BlyGaTUWSKDCbgaOtlrYDWGrdwdlEX7u5yZHrHswji6AmnUnaeMJeX0uz gvqEbn4voKq/2tU96W0Gak1P0fgJTp3nZU6T+OGUW2Rt3EiWNZTZgNKDlWQZjJVNXVO4 ORC2PrqUSNuJe45D5P7j28maQA43j2pW4Kk80HdlTu8KO8jnwRwpLGpzB2dpidfIJeOV 0y7Um3afYSRsTWH8IgWl3NNvpiwXccUhFTr2Fylt5Di3pkbDmHqjwAbJuk7cIyV2PzCy wg8g== X-Gm-Message-State: AO0yUKWSj+hSSEJoM3T9kOgvRzC6LpItivydCL9uzu5v3zAeJ8JQWYPK 92RTq+ekAd7De5EzMhyQe/X+t0nFydi1QpG1tvM= X-Google-Smtp-Source: AK7set+Ljp1M7Po2AhFN3Mw9HphArTr/+Z5OMEVnsQcLbpUhXxnTJ99Bu5Q10/VUWlLnoQSZrjOJAw== X-Received: by 2002:a17:903:40cf:b0:19b:c29:a74b with SMTP id t15-20020a17090340cf00b0019b0c29a74bmr266652pld.34.1676829021528; Sun, 19 Feb 2023 09:50:21 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id a13-20020a170902b58d00b001991e4e0bdcsm6238408pls.233.2023.02.19.09.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 09:50:21 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Tyler Retzlaff , Vladimir Medvedkin Subject: [PATCH v3 6/8] rib: enable on Windows Date: Sun, 19 Feb 2023 09:50:11 -0800 Message-Id: <20230219175013.10057-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219175013.10057-1-stephen@networkplumber.org> References: <20230207001937.875608-1-stephen@networkplumber.org> <20230219175013.10057-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