From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id BE6262BA2 for ; Wed, 7 Jun 2017 22:12:44 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id d73so18343084wma.0 for ; Wed, 07 Jun 2017 13:12:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=tNDA+TgwBnJIGuUvpTQ/EmQYtOo9rW5s3uzPjXfARwA=; b=YjI2Lwlxrs6xZn/yOy5G5NaP66zzsGPeauEYxBcnsSwRxW+UPOtJe0BN+mZmoJMCUT qodNMeiDvi6rS39GUUGvCfgKUgDKT4bnMgaTD2GV4vTZoqYfKfbredB51cJYU0R3qDNM U69W/8OqLYg/VabWu6g4Pz4VqRKJbYQw6Y23ObGxkF/gKANGi32iYsvgPeQTpFtZQgvg TcyyOpqhWBGmeOX/YJPOQu5bIdSMjIwkThQUPl42oRWiq7rPo1Uf9HNrzVRw/p3sJZvj 3jp+9IaQE4eP83x7KrNmW43lucKxSZlHtiW4gsytgBlj2ESxvixl0Hk7hHioCbZnq2do Gpvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=tNDA+TgwBnJIGuUvpTQ/EmQYtOo9rW5s3uzPjXfARwA=; b=V5kD/N0e68RJgw5VlqSPLs6J7w+lWYLOWuDuLx+9Zqzzk0Fqfvp3RBJ61X/lACiFUY 2nVZwVtuAhka5x/F3ZnLcIU5dgB4NWETEGe9rzoTnmIaEYvtzANtjyE54qplKBxNZSsD qg6QPz/70vbP195lCXVJg0ls8uuN9bfFtxZ9jb6lGYTnkDu+WT0n92V6mFoSWWEKPIBV BDcBiwpscfk5djao2ngScgepPQjxWy76PUTG0Z8zN7TGbH2si+JACi00OIwkidQ/oeAt IDR895gqhWrZdwqhRq3YRymmVNdz5SuABZ5XovtVJTVbc9ohGa8Icx8CjYfcLDBCWPMV KPQw== X-Gm-Message-State: AODbwcBYqUD7ZteiDfT0FKV9cTKZL7eV3JRO6SJGDCTDI5McYDdce2hI vOckG0DhZiMjT6Ua X-Received: by 10.28.227.7 with SMTP id a7mr916809wmh.73.1496866364249; Wed, 07 Jun 2017 13:12:44 -0700 (PDT) Received: from bidouze.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 3sm2943669wru.50.2017.06.07.13.12.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2017 13:12:43 -0700 (PDT) Date: Wed, 7 Jun 2017 22:12:37 +0200 From: =?iso-8859-1?Q?Ga=EBtan?= Rivet To: Jan Blunck Cc: dev Message-ID: <20170607201237.GV18840@bidouze.vm.6wind.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH v2 04/11] bus: add bus helper iterator to find a particular device 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: , X-List-Received-Date: Wed, 07 Jun 2017 20:12:45 -0000 On Wed, Jun 07, 2017 at 06:41:58PM +0200, Jan Blunck wrote: > On Wed, May 31, 2017 at 3:17 PM, Gaetan Rivet wrote: > > From: Jan Blunck > > > > Signed-off-by: Jan Blunck > > Signed-off-by: Gaetan Rivet > > --- > > lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 + > > lib/librte_eal/common/eal_common_bus.c | 25 +++++++++++++++++++++++++ > > lib/librte_eal/common/include/rte_bus.h | 23 +++++++++++++++++++++++ > > lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 + > > 4 files changed, 50 insertions(+) > > > > diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > > index f1a0765..21640d6 100644 > > --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map > > +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map > > @@ -164,6 +164,7 @@ DPDK_17.05 { > > > > rte_bus_find; > > rte_bus_find_by_device; > > + rte_bus_find_device; > > rte_cpu_is_supported; > > rte_log_dump; > > rte_log_register; > > diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c > > index 811aff3..632a6e7 100644 > > --- a/lib/librte_eal/common/eal_common_bus.c > > +++ b/lib/librte_eal/common/eal_common_bus.c > > @@ -182,3 +182,28 @@ struct rte_bus *rte_bus_find_by_device(const struct rte_device *dev) > > { > > return rte_bus_find(bus_find_device, (const void *)dev); > > } > > + > > +struct rte_device * > > +rte_bus_find_device(const struct rte_device *start, > > + rte_dev_match_t match, const void *data) > > +{ > > + struct rte_bus *bus; > > + struct rte_device *dev = NULL; > > + int start_seen = 0; > > + > > + TAILQ_FOREACH(bus, &rte_bus_list, next) { > > I don't think that this should use the TAILQ_FOREACH() macro since it > makes the code nesting deeper unnecessarily. > > While debugging the previous version, I found rather difficult to follow the nesting of iterators / callback calls. I preferred laying all of it down and simplifying the flow. The nesting is either within the same scope or divided among several scopes. I proposed the former as I found it easier to write and read, but that's subjective. > > + if (!bus->find_device) > > + continue; > > + if (!!start ^ start_seen) { > > + dev = bus->find_device(cmp_rte_device, start); > > + if (dev) > > + start_seen = 1; > > + else > > + continue; > > + } > > + dev = bus->find_device(match, data); > > + if (dev) > > + break; > > + } > > + return dev; > > +} > > diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h > > index 0664662..b56018f 100644 > > --- a/lib/librte_eal/common/include/rte_bus.h > > +++ b/lib/librte_eal/common/include/rte_bus.h > > @@ -180,6 +180,29 @@ typedef int (*rte_bus_match_t)(const struct rte_bus *bus, const void *data); > > struct rte_bus *rte_bus_find(rte_bus_match_t match, const void *data); > > > > /** > > + * Bus iterator to find a particular device. > > + * > > + * If the callback returns non-zero this function will stop iterating over any > > + * more buses and devices. To continue a search the device of a previous search > > + * is passed via the start parameters. > > + * > > + * @param start > > + * Start device of the iteration > > + * > > + * @param match > > + * Callback function to check device > > + * > > + * @param data > > + * Data to pass to match callback > > + * > > + * @return > > + * A pointer to a rte_bus structure or NULL in case no bus matches > > + */ > > +struct rte_device * > > +rte_bus_find_device(const struct rte_device *start, > > + rte_dev_match_t match, const void *data); > > + > > +/** > > * Find the registered bus for a particular device. > > */ > > struct rte_bus *rte_bus_find_by_device(const struct rte_device *dev); > > diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map > > index 6f77222..e0a056d 100644 > > --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map > > +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map > > @@ -168,6 +168,7 @@ DPDK_17.05 { > > > > rte_bus_find; > > rte_bus_find_by_device; > > + rte_bus_find_device; > > rte_cpu_is_supported; > > rte_intr_free_epoll_fd; > > rte_log_dump; > > -- > > 2.1.4 > > -- Gaëtan Rivet 6WIND