From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id CE98A803F for ; Mon, 15 Dec 2014 06:20:30 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id et14so11152529pad.29 for ; Sun, 14 Dec 2014 21:20:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=mXYKMnXz0fQsiV2oENQQM5NseZDqyEXS7Lpu5PXVVKU=; b=HtvM/2OL5M++xFfTtnUQhK6/Kn7lDkkwa+EkEWFXSBGku8BY7S9XZeIljlsrb4p8Z2 qeUrYbSLLzoydyO9SXYSZOIDUR7gbqYLvSkL251H3ag3ghGI3BAz557crT17BqAVs+F4 xjDEtjOjNrlsxXiWu1QRNQn0qR6xGbhKPuo3bzTHimzJto3dx2TIHp37PRFoxX0Gsve9 fVIt5YNpxSxsKjNTJRT6q9dwYafS9wZjwaLHgujETITJBitWTLYX2DvuZrWpgxeYAIza mMjDg/PQ9zq2q/kOIfsLoHfB8+l0kA/h5pDeMc4+bbwz203JGHqhJyJYDiYDc+IUV6BW +7Yw== X-Gm-Message-State: ALoCoQkxXcfFkQpS8FQvvy9Dp5PGt2ow+lCWx7uqoW8lIfcw8fa8vve340TYSMJ4L2M3GT/CYQCL X-Received: by 10.68.211.104 with SMTP id nb8mr47840379pbc.29.1418620830060; Sun, 14 Dec 2014 21:20:30 -0800 (PST) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id w2sm7902394pbs.59.2014.12.14.21.20.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Dec 2014 21:20:29 -0800 (PST) Message-ID: <548E6F9C.1000807@igel.co.jp> Date: Mon, 15 Dec 2014 14:20:28 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Huawei Xie , dev@dpdk.org References: <1418247477-13920-1-git-send-email-huawei.xie@intel.com> <1418247477-13920-8-git-send-email-huawei.xie@intel.com> In-Reply-To: <1418247477-13920-8-git-send-email-huawei.xie@intel.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: haifeng.lin@intel.com Subject: Re: [dpdk-dev] [PATCH RFC v2 07/12] lib/librte_vhost: async event and callback X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 05:20:31 -0000 (2014/12/11 6:37), Huawei Xie wrote: > Signed-off-by: Huawei Xie > --- > lib/librte_vhost/vhost_user/fd_man.c | 205 +++++++++++++++++++++++++++++++++++ > lib/librte_vhost/vhost_user/fd_man.h | 64 +++++++++++ > 2 files changed, 269 insertions(+) > create mode 100644 lib/librte_vhost/vhost_user/fd_man.c > create mode 100644 lib/librte_vhost/vhost_user/fd_man.h > > diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/vhost_user/fd_man.c > new file mode 100644 > index 0000000..f4db68b > --- /dev/null > +++ b/lib/librte_vhost/vhost_user/fd_man.c > @@ -0,0 +1,205 @@ > +/*- > + * BSD LICENSE > + * > + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name of Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +#include "fd_man.h" > + > +/** > + * Returns the index in the fdset for a given fd. > + * If fd is -1, it means to search for a free entry. > + * @return > + * index for the fd, or -1 if fd isn't in the fdset. > + */ > +static int > +fdset_find_fd(struct fdset *pfdset, int fd) > +{ > + int i; > + > + if (pfdset == NULL) > + return -1; > + > + for (i = 0; i < pfdset->num && pfdset->fd[i].fd != fd; i++); I got error from checkpatch.pl like followings. ERROR: trailing statements should be on next line #74: FILE: lib/librte_vhost/vhost_user/fd_man.c:61: + for (i = 0; i < pfdset->num && pfdset->fd[i].fd != fd; i++); > + > + return i == pfdset->num ? -1 : i; > +} > + > +static int > +fdset_find_free_slot(struct fdset *pfdset) > +{ > + return fdset_find_fd(pfdset, -1); > +} > + > +static void > +fdset_add_fd(struct fdset *pfdset, int idx, int fd, > + fd_cb rcb, fd_cb wcb, uint64_t dat) > +{ > + struct fdentry *pfdentry; > + > + if (pfdset == NULL || idx >= pfdset->num) > + return; > + > + pfdentry = &pfdset->fd[idx]; > + pfdentry->fd = fd; > + pfdentry->rcb = rcb; > + pfdentry->wcb = wcb; > + pfdentry->dat = dat; > +} > + > +/** > + * Fill the read/write fdset with the fds in the fdset. > + * @return > + * the maximum fds filled in the read/write fd_set. > + */ > +static int > +fdset_fill(fd_set *rfset, fd_set *wfset, struct fdset *pfdset) > +{ > + struct fdentry *pfdentry; > + int i, maxfds = -1; > + int num = MAX_FDS; Is it possible to use pfdset->num? > + > + if (pfdset == NULL) > + return -1; > + > + for (i = 0; i < num ; i++) { > + pfdentry = &pfdset->fd[i]; > + if (pfdentry->fd != -1) { > + int added = 0; Need a line? > + if (pfdentry->rcb && rfset) { > + FD_SET(pfdentry->fd, rfset); > + added = 1; > + } > + if (pfdentry->wcb && wfset) { > + FD_SET(pfdentry->fd, wfset); > + added = 1; > + } > + if (added) > + maxfds = pfdentry->fd < maxfds ? > + maxfds : pfdentry->fd; > + } > + } > + return maxfds; > +} > + > +void > +fdset_init(struct fdset *pfdset) > +{ > + int i; > + > + if (pfdset == NULL) > + return; > + > + for (i = 0; i < MAX_FDS; i++) > + pfdset->fd[i].fd = -1; > + pfdset->num = MAX_FDS; > +} > + > +/** > + * Register the fd in the fdset with read/write handler and context. > + */ > +int > +fdset_add(struct fdset *pfdset, int fd, fd_cb rcb, fd_cb wcb, uint64_t dat) > +{ > + int i; > + > + if (pfdset == NULL || fd == -1) > + return -1; > + > + /* Find a free slot in the list. */ > + i = fdset_find_free_slot(pfdset); > + if (i == -1) > + return -2; > + > + fdset_add_fd(pfdset, i, fd, rcb, wcb, dat); > + > + return 0; > +} > + > +/** > + * Unregister the fd from the fdset. > + */ > +void > +fdset_del(struct fdset *pfdset, int fd) > +{ > + int i; > + > + i = fdset_find_fd(pfdset, fd); > + if (i != -1) { > + pfdset->fd[i].fd = -1; > + pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL; > + } > +} > + > +/** > + * This functions runs in infinite blocking loop until there is no fd in > + * pfdset. It calls corresponding r/w handler if there is event on the fd. > + */ > +void > +fdset_event_dispatch(struct fdset *pfdset) > +{ > + fd_set rfds,wfds; Need a space between rfds and wfds. > + int i, maxfds; > + struct fdentry *pfdentry; > + int num = MAX_FDS; Is it possible to use pfdset->num? > + > + if (pfdset == NULL) > + return; > + > + while (1) { > + FD_ZERO(&rfds); > + FD_ZERO(&wfds); > + maxfds = fdset_fill(&rfds, &wfds, pfdset); > + if (maxfds == -1) { > + return; > + } > + > + select(maxfds + 1, &rfds, &wfds, NULL, NULL); > + > + for (i = 0; i < num; i++) { > + pfdentry = &pfdset->fd[i]; > + if (FD_ISSET(pfdentry->fd, &rfds) && pfdentry->rcb) > + pfdentry->rcb(pfdentry->fd, pfdentry->dat); > + if (FD_ISSET(pfdentry->fd, &wfds) && pfdentry->wcb) > + pfdentry->wcb(pfdentry->fd, pfdentry->dat); > + } > + } > +} > diff --git a/lib/librte_vhost/vhost_user/fd_man.h b/lib/librte_vhost/vhost_user/fd_man.h > new file mode 100644 > index 0000000..1722954 > --- /dev/null > +++ b/lib/librte_vhost/vhost_user/fd_man.h > @@ -0,0 +1,64 @@ > +/*- > + * BSD LICENSE > + * > + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * > + * * Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * * Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > + * the documentation and/or other materials provided with the > + * distribution. > + * * Neither the name of Intel Corporation nor the names of its > + * contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#ifndef _FD_MAN_H_ > +#define _FD_MAN_H_ > +#include > + > +#define MAX_FDS 1024 > + > +typedef void (*fd_cb)(int fd, uint64_t dat); > + > +struct fdentry { > + int fd; /* -1 indicates this entry is empty */ > + fd_cb rcb; /* callback when this fd is readable. */ > + fd_cb wcb; /* callback when this fd is writeable.*/ > + uint64_t dat; /* fd context */ > +}; > + > +struct fdset { > + struct fdentry fd[MAX_FDS]; > + int num; /* capacity of this fdset */ > +}; > + > + > +void fdset_init(struct fdset *pfdset); > + > +int fdset_add(struct fdset *pfdset, int fd, > + fd_cb rcb, fd_cb wcb, uint64_t ctx); > + > +void fdset_del(struct fdset *pfdset, int fd); > + > +void fdset_event_dispatch(struct fdset *pfdset); > + > +#endif