From patchwork Wed Sep 19 16:03:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 44962 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 36F4C5B40; Wed, 19 Sep 2018 18:04:19 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by dpdk.org (Postfix) with ESMTP id 8EAD258FE for ; Wed, 19 Sep 2018 18:04:10 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id r1-v6so9826004wmh.0 for ; Wed, 19 Sep 2018 09:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XTb1L+T7RmcXKcS3DjXnOnahNwZkE5hFhYI7mthjnJk=; b=QAWJfBDvb2YEYaMwrdtl+brduWQP1uqhfRfAhkX1WO3oywBDRTOo/tYPnHyZPf2ZXB 2GiwqcqVMxpE5ZSQvzF5n/esnuuQcgtaZ+/dOtI+qpDUIcW7Ogh7jA1E9P4K5naDlx+W eJ1zxVCDZe4cRmBLQUB103p9BP6az1Hqg+znhXeIj/c9rFg6Rs5/s+tXEJ5II9LgQD77 eBn8ihulomoVDafEZMW0LDoy8bxG8tUfOFauqjtIgVDwusUwsNElYs5ILvnJOIDw8Eyt 1m0dLEOPTiS2R4FTjRIvKlNkdVfVfJR/LuUviRGAIqpL5COsrlcxW24SL2iq+Ekvj6yG yjrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XTb1L+T7RmcXKcS3DjXnOnahNwZkE5hFhYI7mthjnJk=; b=rROthU3Bphzcusp+p9AjyKShW4lWvLn76+prtUTAYRMSUZxTV5UQ12oAGZeqIy0NWX BiIGUWanqPJaqQMGCF7dOB4RQXTSMQrem06Sx5PQZ216GHg+pP41Ggm3NBxNw0YXSe4d iRRkxKtwYP4bAC0gGRJ5ZRdw8a0Q22r6a9ew/9bks5j1G//02faZNoDr+OFPBRBUya/G I+trddHyMdbo8E0Dkfa1fLgciGurETbNTDF2UN99JmJgK9qGPPIfv+7nWBTU7qmH/5DP 1GTR7hELEpHvRGI2AAj2SJrWcc9PKrfYYm1Pg7oZtzQAGFfLVXbhPeiLXZ4ViIPeTb43 hVEw== X-Gm-Message-State: APzg51DrKSRiKwp9IayTRq1uGUN8/oxydy4w0vO7OB4lWJne1P5BYbr7 838j8Nah7G4A3xpIUCa72rUKvXiA8ws= X-Google-Smtp-Source: ANB0Vda7jkMWlCihRBV5kq52/Vza8tqkKt8mr45aq8s/tMO/01e821HahD8Z6y87r0SMnatPqe6exw== X-Received: by 2002:a1c:c345:: with SMTP id t66-v6mr1507929wmf.100.1537373049750; Wed, 19 Sep 2018 09:04:09 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id x24-v6sm34983671wrd.13.2018.09.19.09.04.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 09:04:09 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 19 Sep 2018 18:03:35 +0200 Message-Id: <0c431b2c36f7ef5df0195a173f1ceeb0ca4d6671.1537372746.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 05/13] ethdev: add private generic device iterator X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This iterator can be customized with a comparison function that will trigger a stopping condition. It can be leveraged to write several different iterators that have similar but non-identical purposes. It is private to librte_ethdev. Signed-off-by: Gaetan Rivet Acked-by: Andrew Rybchenko --- lib/librte_ethdev/Makefile | 1 + lib/librte_ethdev/ethdev_private.c | 31 ++++++++++++++++++++++++++++++ lib/librte_ethdev/ethdev_private.h | 26 +++++++++++++++++++++++++ lib/librte_ethdev/meson.build | 3 ++- 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 lib/librte_ethdev/ethdev_private.c create mode 100644 lib/librte_ethdev/ethdev_private.h diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile index 0935a275e..4b0eeaac7 100644 --- a/lib/librte_ethdev/Makefile +++ b/lib/librte_ethdev/Makefile @@ -18,6 +18,7 @@ EXPORT_MAP := rte_ethdev_version.map LIBABIVER := 10 +SRCS-y += ethdev_private.c SRCS-y += rte_ethdev.c SRCS-y += rte_flow.c SRCS-y += rte_tm.c diff --git a/lib/librte_ethdev/ethdev_private.c b/lib/librte_ethdev/ethdev_private.c new file mode 100644 index 000000000..768c8b2ed --- /dev/null +++ b/lib/librte_ethdev/ethdev_private.c @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Gaëtan Rivet + */ + +#include "rte_ethdev.h" +#include "ethdev_private.h" + +struct rte_eth_dev * +eth_find_device(const struct rte_eth_dev *start, rte_eth_cmp_t cmp, + const void *data) +{ + struct rte_eth_dev *edev; + ptrdiff_t idx; + + /* Avoid Undefined Behaviour */ + if (start != NULL && + (start < &rte_eth_devices[0] || + start > &rte_eth_devices[RTE_MAX_ETHPORTS])) + return NULL; + if (start != NULL) + idx = start - &rte_eth_devices[0] + 1; + else + idx = 0; + for (; idx < RTE_MAX_ETHPORTS; idx++) { + edev = &rte_eth_devices[idx]; + if (cmp(edev, data) == 0) + return edev; + } + return NULL; +} + diff --git a/lib/librte_ethdev/ethdev_private.h b/lib/librte_ethdev/ethdev_private.h new file mode 100644 index 000000000..0f5c6d5c4 --- /dev/null +++ b/lib/librte_ethdev/ethdev_private.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Gaëtan Rivet + */ + +#ifndef _RTE_ETH_PRIVATE_H_ +#define _RTE_ETH_PRIVATE_H_ + +#include "rte_ethdev.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Generic rte_eth_dev comparison function. */ +typedef int (*rte_eth_cmp_t)(const struct rte_eth_dev *, const void *); + +/* Generic rte_eth_dev iterator. */ +struct rte_eth_dev * +eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp, + const void *data); + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_ETH_PRIVATE_H_ */ diff --git a/lib/librte_ethdev/meson.build b/lib/librte_ethdev/meson.build index 596cd0f39..7798217d0 100644 --- a/lib/librte_ethdev/meson.build +++ b/lib/librte_ethdev/meson.build @@ -4,7 +4,8 @@ name = 'ethdev' version = 10 allow_experimental_apis = true -sources = files('ethdev_profile.c', +sources = files('ethdev_private.c', + 'ethdev_profile.c', 'rte_ethdev.c', 'rte_flow.c', 'rte_mtr.c',