From patchwork Thu Dec 1 01:44:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 120393 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C93FEA00C2; Thu, 1 Dec 2022 02:45:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D090A42D38; Thu, 1 Dec 2022 02:44:50 +0100 (CET) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id 96AAB42D30 for ; Thu, 1 Dec 2022 02:44:49 +0100 (CET) Received: by mail-pj1-f50.google.com with SMTP id q17-20020a17090aa01100b002194cba32e9so3780330pjp.1 for ; Wed, 30 Nov 2022 17:44:49 -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=HsymL2NRTdS11wClSJDvXnUdG1fbfU0UCnvx/TYgs8c=; b=Q2forgNoWSUG+xWMrtk9Feocxf5xpHZXza8f9KvFNfYmY8tSz1VIUUSPOXeAI3/pro vNxYnOvLSsT7y0FZ+WgTE5Uk7xtksS2FrPwB27RgyX217nvbTkspxkh6pnGLB+GlPaml HxVRttW+Zl6G46FoTe+IdFpVk81bWSvfqHePKM2gGXkTGc+HTWK7pWjSpL+bZP9btKia E1347Zug0mVM6fhkKviwa/pth3qyWbGpuMZ+pzAc3kV/re1KXspgKW9FhSEh9hwqxuCT PjvKLKrCw2Sdzwt5C69l1wMzq26P9gK3UrJJw8NGEHjWoibmLMpgDFcHFCvIbpBxZWQ5 n8Hw== 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=HsymL2NRTdS11wClSJDvXnUdG1fbfU0UCnvx/TYgs8c=; b=iis3CpHxX6fkETxRhaOgNEJd1EPZm4E23baCRfDWWnhn8PxpLYvEbLouRIIZYsBob+ UB6/5HFVp0KpS6RtPbF+tjcfII7bCEpTEhGG5P9IxbKdRZTjhJH8G/tcPXszTT4zSE3J nM1eKn72VZg3x0o8S3y72vuQ7Y81pX0bnaO5hXEvJkqPu/0QIM/qxcC4wOK0DUoNAGH0 Ka+vGsCNqde4TMmRIJPnyAkuiXEyE6JXTdfroeWhVnUMGV+UOazKVwoEc30FaCHRWH/3 vQ+lwCpa32wSoVdxj1Hery1OWYTKlZMoLR6yg2KNaet9VlXnYlAhCX7CRX3HnlSLBU4x i9GQ== X-Gm-Message-State: ANoB5pnUnz2/yenuYx00sb7AdJbgSo0gssj9RUPiUv5kee2aU/FlOicA KPqeat6P31g4J0DyCMDCR8pQEHEcPthBg308 X-Google-Smtp-Source: AA0mqf7oTihVFL/6lhWCYZrT0ptr5S70Clt4yRgg0lhVZruSfxstkjwIsOHTBLuJ0pfgCJFuxMQmUQ== X-Received: by 2002:a17:90b:3012:b0:219:63d9:516c with SMTP id hg18-20020a17090b301200b0021963d9516cmr6105619pjb.108.1669859088567; Wed, 30 Nov 2022 17:44:48 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id h14-20020a170902680e00b00186ffe62502sm2125014plk.254.2022.11.30.17.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 17:44:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Vladimir Medvedkin Subject: [PATCH 6/8] rib: enable on Windows Date: Wed, 30 Nov 2022 17:44:37 -0800 Message-Id: <20221201014440.11896-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221201014440.11896-1-stephen@networkplumber.org> References: <20221201014440.11896-1-stephen@networkplumber.org> MIME-Version: 1.0 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