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 574DD41E23; Thu, 9 Mar 2023 22:32:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 72ECE42D1A; Thu, 9 Mar 2023 22:31:40 +0100 (CET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mails.dpdk.org (Postfix) with ESMTP id E24F141611 for ; Thu, 9 Mar 2023 22:31:36 +0100 (CET) Received: by mail-pl1-f178.google.com with SMTP id y11so3475750plg.1 for ; Thu, 09 Mar 2023 13:31:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1678397496; 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=BlyxtV1vfP9B5qLyBX3G4A/Bc0oRxe7qGluVua0afRo=; b=CIDRpK1md2mM7Yo0liJy0ezddmmX2uVv5O2Okb1RckRuNms/PzHOe2C2Ubpxi30qrq KOn+ZsQN6LIEg898C/mKw+TGo9XQ17kL58sfFFGhjjhwgm5RGGIIH/Dr3r9VQAdAHDb8 rYG63ZB/C1LVzkxw+t1SqcAd5eiODrD4vkRykIoNSQCyT/bmWl1FYGfkATkIr+ypTcSn FKqe2gqfcYqbtFftVG6ksK2bDUeYxH1LUTUwT326q6R2jiLFLz6S/LcMC1fvJughunIU ZTNYuoCOa0hd9kqz74Z16HAkROWyyIElFBVzJlo/LKU+pUmgc47+CFmaxKnt6UcUP46b 2eKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678397496; 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=BlyxtV1vfP9B5qLyBX3G4A/Bc0oRxe7qGluVua0afRo=; b=3LeoEIJRla6VOwh9h2cPcr12ecReaHXDHsky8tQ+SxvXUmA/Myjp57KRxJdVxNn1QV BQrCblOSaCiVwCnNkEOaUUD89OdVAfVagOjpXrUW1WPep18fkPcHv6oJLpCpaHHYBf5s o6/vV2Jt3zXp6dUtmAWebaXM5+mzaM3c+zYlyGY/snfyJaqlCKImXC9vetFX7gbLFsTK mkl5shwPQafNYBKONmmAaoJJ/7+AcpX++fmpNqYEzAPAtX9gWjj0zlcSMAmhrJzHHr2n BZ1rMM9xLTFlWZ/E9JN5Ii8f9S/prt7nzw/Fe++gjQ9RA6JKE3yowg3IT1TtbMyJ1cZT uXgQ== X-Gm-Message-State: AO0yUKUX4jZ2toqbMqCrHVtkMkA3sn6KOW3KWEsUHOwvblYgOqykIi0I Jyn6+hrlg2V5m434HfoS0esh4s58slqAQ3KBh1UmMg== X-Google-Smtp-Source: AK7set8/docFzY8MBjziqGcCXIeN8j7nXBaAemYCFJtaRVfHFPdkJ7TludjRq0k8KuVgK+t4l/cpSg== X-Received: by 2002:a05:6a21:788b:b0:cb:77f0:9a27 with SMTP id bf11-20020a056a21788b00b000cb77f09a27mr25958846pzc.24.1678397495890; Thu, 09 Mar 2023 13:31:35 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id q3-20020a63cc43000000b00502e4015ff7sm64225pgi.23.2023.03.09.13.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 13:31:35 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Tyler Retzlaff Subject: [PATCH v5 6/9] rib: enable on Windows Date: Thu, 9 Mar 2023 13:31:25 -0800 Message-Id: <20230309213128.34146-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309213128.34146-1-stephen@networkplumber.org> References: <20221201014440.11896-1-stephen@networkplumber.org> <20230309213128.34146-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.2