From patchwork Thu Oct 19 16:36:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 30603 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 1C84E1B285; Thu, 19 Oct 2017 18:44:12 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id D70621B27D; Thu, 19 Oct 2017 18:44:10 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Oct 2017 09:44:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.43,402,1503385200"; d="scan'208"; a="1232780093" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga002.fm.intel.com with ESMTP; 19 Oct 2017 09:44:08 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org Date: Thu, 19 Oct 2017 17:36:26 +0100 Message-Id: <20171019163629.28618-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171019163629.28618-1-bruce.richardson@intel.com> References: <20171019163629.28618-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH 2/5] eal/bsdapp: fix missing interrupt stub functions 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" A number of interrupt functions only existed on Linux. Adding in stubs for these functions corrects this omission, and allows the map files for both Linux and FreeBSD to be identical. CC: stable@dpdk.org Fixes: 9efe9c6cdcac ("eal/linux: add epoll wrappers") Signed-off-by: Bruce Richardson --- lib/librte_eal/bsdapp/eal/eal_interrupts.c | 35 +++++++++++++++++++++++++++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 6 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/bsdapp/eal/eal_interrupts.c index ea2afff4a..deba87702 100644 --- a/lib/librte_eal/bsdapp/eal/eal_interrupts.c +++ b/lib/librte_eal/bsdapp/eal/eal_interrupts.c @@ -125,3 +125,38 @@ rte_intr_cap_multiple(struct rte_intr_handle *intr_handle) RTE_SET_USED(intr_handle); return 0; } + +int +rte_epoll_wait(int epfd, struct rte_epoll_event *events, + int maxevents, int timeout) +{ + RTE_SET_USED(epfd); + RTE_SET_USED(events); + RTE_SET_USED(maxevents); + RTE_SET_USED(timeout); + + return -ENOTSUP; +} + +int +rte_epoll_ctl(int epfd, int op, int fd, struct rte_epoll_event *event) +{ + RTE_SET_USED(epfd); + RTE_SET_USED(op); + RTE_SET_USED(fd); + RTE_SET_USED(event); + + return -ENOTSUP; +} + +int +rte_intr_tls_epfd(void) +{ + return -ENOTSUP; +} + +void +rte_intr_free_epoll_fd(struct rte_intr_handle *intr_handle) +{ + RTE_SET_USED(intr_handle); +} diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 080896f73..c173ccfdb 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -96,11 +96,14 @@ DPDK_2.0 { DPDK_2.1 { global: + rte_epoll_ctl; + rte_epoll_wait; rte_intr_allow_others; rte_intr_dp_is_en; rte_intr_efd_disable; rte_intr_efd_enable; rte_intr_rx_ctl; + rte_intr_tls_epfd; rte_memzone_free; } DPDK_2.0; @@ -160,9 +163,10 @@ DPDK_17.05 { global: rte_cpu_is_supported; + rte_intr_free_epoll_fd; rte_log_dump; - rte_log_register; rte_log_get_global_level; + rte_log_register; rte_log_set_global_level; rte_log_set_level; rte_log_set_level_regexp;