From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnon Warshavsky Subject: [PATCH v5 08/11] eal: replace rte_panic instances in interrupts thread Date: Tue, 24 Apr 2018 00:28:59 +0300 Message-ID: <1524518942-1998-9-git-send-email-arnon@qwilt.com> References: <1524518942-1998-1-git-send-email-arnon@qwilt.com> Cc: dev@dpdk.org, arnon@qwilt.com To: thomas@monjalon.net, anatoly.burakov@intel.com, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Return-path: Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id 0668B2B92 for ; Mon, 23 Apr 2018 23:29:31 +0200 (CEST) In-Reply-To: <1524518942-1998-1-git-send-email-arnon@qwilt.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" replace panic calls with log and return value. Thread function removes the noreturn attribute. Signed-off-by: Arnon Warshavsky --- lib/librte_eal/linuxapp/eal/eal_interrupts.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c index 58e9328..77e6f2a 100644 --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c @@ -785,7 +785,7 @@ struct rte_intr_source { * @return * never return; */ -static __attribute__((noreturn)) void * +static void * eal_intr_thread_main(__rte_unused void *arg) { struct epoll_event ev; @@ -803,8 +803,11 @@ static __attribute__((noreturn)) void * /* create epoll fd */ int pfd = epoll_create(1); - if (pfd < 0) - rte_panic("Cannot create epoll instance\n"); + if (pfd < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create epoll instance\n", + __func__); + return NULL; + } pipe_event.data.fd = intr_pipe.readfd; /** @@ -813,8 +816,11 @@ static __attribute__((noreturn)) void * */ if (epoll_ctl(pfd, EPOLL_CTL_ADD, intr_pipe.readfd, &pipe_event) < 0) { - rte_panic("Error adding fd to %d epoll_ctl, %s\n", + RTE_LOG(CRIT, EAL, "%s(): Error adding fd to %d " + "epoll_ctl, %s\n", + __func__, intr_pipe.readfd, strerror(errno)); + return NULL; } numfds++; @@ -831,9 +837,12 @@ static __attribute__((noreturn)) void * * into wait list. */ if (epoll_ctl(pfd, EPOLL_CTL_ADD, - src->intr_handle.fd, &ev) < 0){ - rte_panic("Error adding fd %d epoll_ctl, %s\n", - src->intr_handle.fd, strerror(errno)); + src->intr_handle.fd, &ev) < 0) { + RTE_LOG(CRIT, EAL, "%s(): Error adding fd %d epoll_ctl, %s\n", + __func__, + src->intr_handle.fd, + strerror(errno)); + return NULL; } else numfds++; @@ -848,6 +857,8 @@ static __attribute__((noreturn)) void * */ close(pfd); } + + return NULL; } int -- 1.8.3.1