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 5BC2241CE4; Mon, 20 Feb 2023 00:14:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 120D142D9C; Mon, 20 Feb 2023 00:14:34 +0100 (CET) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id 5AAE342D8A for ; Mon, 20 Feb 2023 00:14:26 +0100 (CET) Received: by mail-pj1-f54.google.com with SMTP id pt11so145081pjb.1 for ; Sun, 19 Feb 2023 15:14:26 -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=JqKVHI6aNDICd7GwiqF6ylJppK65jwBVZfOOEU2QE7EJKMnJ8LFZ6bB0maFFC3O54H EJEbk7tNHmc2uXX1A67RGo0dllPhGLv6N41L9c5sBN7XbXP+XxkJwiA4pJfUvLwmzrAt SF9j3lOjSGjPQ6nBBkrXEGhNzUxympDD7wVydnniS4NLxrZQxnpnSoG7eyDfCbZDIHVG kEyJSBiYMl5Jy8xjQaySjVOsd4Jl/1aqQxqFxD17DXQDU6MjfdkcG6K3F7kOdrp+Nbo/ rSt/9epKEwJIwUDd2ln/GmNCPghm6Tg70WlowRVJZdu6D9I/CAB4sHnzNstKSlpQCC8w F1Hg== 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=l727HoHuL0Wrhge3Qn2+6Fw+59LCVgVEU3d2nsLAJ0PYiMsYOb6MzkeORddI1Yv/GE 9sGGxNHw2byw5iCoDDBYTKGDmH+HabLf8UBIDBwzOTXMe86ed/MZ9jbmUtu50xlOYy6a zAwAIzsXgQR6BXR5c9LzLyyRgzxHS+RJMnPJ6KqGWff7NYAEw87Uk7PzLwHg+Xm5MT36 SdZmk6mVTUtP0aBE/oxtwqK6RTBYM62eXU1KS5Ng5ARnd4+wFOJx2a3AxLTEt7IzBJo6 v85sW7LZp16egHAsGM1/Ele6E9dwZc6Kep73dYTWH7O2YM7RIglw3mygSF66vj8xVnZX 964Q== X-Gm-Message-State: AO0yUKX3Jrm5A4c0oEJHdpbqN+pIfBzTXHtRpKiYAT0vYOom0SktXSGz puosYrSpa6V+kR3ZTrBry0/xos9Est+5p4vE7d0= X-Google-Smtp-Source: AK7set/Xd1dLxAuSVAstjzmMu5CDnZ/gQgvLg24tSG3Iy/GuUXhO3C8ojHyC6SPfaHJ7E423tUqySA== X-Received: by 2002:a17:902:da91:b0:19a:f02c:a05b with SMTP id j17-20020a170902da9100b0019af02ca05bmr3167564plx.3.1676848465204; Sun, 19 Feb 2023 15:14:25 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id l10-20020a170902d34a00b00192fe452e17sm683336plk.162.2023.02.19.15.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 15:14:24 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Tyler Retzlaff , Vladimir Medvedkin Subject: [PATCH v4 6/9] rib: enable on Windows Date: Sun, 19 Feb 2023 15:14:13 -0800 Message-Id: <20230219231416.22524-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219231416.22524-1-stephen@networkplumber.org> References: <20230207001937.875608-1-stephen@networkplumber.org> <20230219231416.22524-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