From patchwork Tue Dec 16 18:53:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Kerur X-Patchwork-Id: 2036 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4BC0F8055; Tue, 16 Dec 2014 19:53:22 +0100 (CET) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by dpdk.org (Postfix) with ESMTP id 286088054 for ; Tue, 16 Dec 2014 19:53:20 +0100 (CET) Received: by mail-pa0-f48.google.com with SMTP id rd3so14607243pab.7 for ; Tue, 16 Dec 2014 10:53:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=6DNxQpGyGSXCaUeJOU2mzTh9i9SVSfhwWn6eVk5w8oY=; b=zEMPtBud9Ul2c41j89vmD+Y4HQP1ABm97ego3rza8FgpC74aCjwlIivBnYYm+9hytW ePjoc7mIU9jqO3Ux3EidTgdeZdJ1wTwNRLETUvimqO6craVg3eqOdfPkCemMp3WJToUf ynYi+B1ypocpbZ8qzCYNOhegg3gEffQMrwQ4le/WnZ3EGWS+xk1fmKgzDdQGydio//0S VWZUO92jnIJK4I4cGOUPy6WH5SJq0EsYYAb7PX2y7lzLpDIMfcbYhBWhGhXwb7xd8l86 yH0HADe40rXQn+QP4aMx2wCvAVekP+jeTHl+oQz5JmLq/1qBgQfzv3D80E+SZNKPE5BX 2m2A== MIME-Version: 1.0 X-Received: by 10.66.65.168 with SMTP id y8mr64240270pas.48.1418755999000; Tue, 16 Dec 2014 10:53:19 -0800 (PST) Received: by 10.70.136.201 with HTTP; Tue, 16 Dec 2014 10:53:18 -0800 (PST) Date: Tue, 16 Dec 2014 10:53:18 -0800 Message-ID: From: Ravi Kerur To: "dev@dpdk.org" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [dpdk-dev] [PATCH 2/2] Makefile changes for moved files. 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use RTE_EXEC_ENV_BSDAPP in common files for code specific to BSD and !RTE_EXEC_ENV_BSDAPP for Linux. Signed-off-by: Ravi Kerur --- lib/librte_eal/bsdapp/eal/Makefile | 6 ++-- lib/librte_eal/common/eal_common_alarm.c | 40 ++++++++++++++++++++++++ lib/librte_eal/common/eal_common_interrupts.c | 45 ++++++++++++++++++++++++++- lib/librte_eal/linuxapp/eal/Makefile | 6 ++-- 4 files changed, 90 insertions(+), 7 deletions(-) SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_dev.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_options.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_alarm.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_debug.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_interrupts.c CFLAGS_eal.o := -D_GNU_SOURCE CFLAGS_eal_thread.o := -D_GNU_SOURCE -- 1.9.1 diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index d434882..3573c08 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -53,11 +53,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_hugepage_info.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_thread.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_log.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_pci.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_debug.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_lcore.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_interrupts.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_alarm.c # from common dir SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_memzone.c @@ -73,6 +70,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_hexdump.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_devargs.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_dev.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_options.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_alarm.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_debug.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_interrupts.c CFLAGS_eal.o := -D_GNU_SOURCE #CFLAGS_eal_thread.o := -D_GNU_SOURCE diff --git a/lib/librte_eal/common/eal_common_alarm.c b/lib/librte_eal/common/eal_common_alarm.c index e8da32f..abc6f74 100644 --- a/lib/librte_eal/common/eal_common_alarm.c +++ b/lib/librte_eal/common/eal_common_alarm.c @@ -30,6 +30,16 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef RTE_EXEC_ENV_BSDAPP +#include +#include + +#include +#include +#include "eal_private.h" + +#else /* !RTE_EXEC_ENV_BSDAPP */ + #include #include #include @@ -80,6 +90,33 @@ static struct rte_intr_handle intr_handle = {.fd = -1 }; static int handler_registered = 0; static void eal_alarm_callback(struct rte_intr_handle *hdl, void *arg); +#endif /* RTE_EXEC_ENV_BSDAPP */ + +#ifdef RTE_EXEC_ENV_BSDAPP + +int +rte_eal_alarm_init(void) +{ + return 0; +} + + +int +rte_eal_alarm_set(uint64_t us __rte_unused, + rte_eal_alarm_callback cb_fn __rte_unused, + void *cb_arg __rte_unused) { + return -ENOTSUP; +} + +int +rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn __rte_unused, + void *cb_arg __rte_unused) { + return -ENOTSUP; +} + +#else /* !RTE_EXEC_ENV_BSDAPP */ int rte_eal_alarm_init(void) { @@ -94,6 +131,7 @@ rte_eal_alarm_init(void) error: rte_errno = errno; return -1; + } static void @@ -266,3 +304,5 @@ rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg) return count; } + +#endif /* RTE_EXEC_ENV_BSDAPP */ diff --git a/lib/librte_eal/common/eal_common_interrupts.c b/lib/librte_eal/common/eal_common_interrupts.c index dc2668a..745413e 100644 --- a/lib/librte_eal/common/eal_common_interrupts.c +++ b/lib/librte_eal/common/eal_common_interrupts.c @@ -31,6 +31,48 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef RTE_EXEC_ENV_BSDAPP + +#include +#include +#include "eal_private.h" + +int +rte_intr_callback_register(struct rte_intr_handle *intr_handle __rte_unused, + rte_intr_callback_fn cb __rte_unused, + void *cb_arg __rte_unused) { + return -ENOTSUP; +} + +int +rte_intr_callback_unregister(struct rte_intr_handle *intr_handle __rte_unused, + rte_intr_callback_fn cb_fn __rte_unused, + void *cb_arg __rte_unused) { + return -ENOTSUP; +} + +int +rte_intr_enable(struct rte_intr_handle *intr_handle __rte_unused) { + return -ENOTSUP; +} + +int +rte_intr_disable(struct rte_intr_handle *intr_handle __rte_unused) { + return -ENOTSUP; +} + +int +rte_eal_intr_init(void) +{ + return 0; +} + +#else /* !RTE_EXEC_ENV_BSDAPP */ + #include #include #include @@ -66,7 +108,7 @@ #include #include "eal_private.h" -#include "eal_vfio.h" +#include #define EAL_INTR_EPOLL_WAIT_FOREVER (-1) @@ -824,3 +866,4 @@ rte_eal_intr_init(void) return -ret; } +#endif /* RTE_EXEC_ENV_BSDAPP */ diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 72ecf3a..0e2ba30 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -62,11 +62,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_uio.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_pci_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_debug.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_lcore.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_timer.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_interrupts.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_alarm.c ifeq ($(CONFIG_RTE_LIBRTE_IVSHMEM),y) SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_ivshmem.c endif @@ -85,6 +82,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_hexdump.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_devargs.c