From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail04.ics.ntt-tx.co.jp (mail05.ics.ntt-tx.co.jp [210.232.35.69]) by dpdk.org (Postfix) with ESMTP id 2CDE21B1A5 for ; Thu, 28 Dec 2017 05:56:15 +0100 (CET) Received: from gwchk03.silk.ntt-tx.co.jp (gwchk03.silk.ntt-tx.co.jp [10.107.0.111]) by mail04.ics.ntt-tx.co.jp (unknown) with ESMTP id vBS4uENW025319 for unknown; Thu, 28 Dec 2017 13:56:14 +0900 Received: (from root@localhost) by gwchk03.silk.ntt-tx.co.jp (unknown) id vBS4uAuV027497 for unknown; Thu, 28 Dec 2017 13:56:10 +0900 Received: from gwchk.silk.ntt-tx.co.jp [10.107.0.110] by gwchk03.silk.ntt-tx.co.jp with ESMTP id PAA27494; Thu, 28 Dec 2017 13:56:10 +0900 Received: from imss03.silk.ntt-tx.co.jp (localhost [127.0.0.1]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id vBS4u9iu011236 for unknown; Thu, 28 Dec 2017 13:56:09 +0900 Received: from mgate01.silk.ntt-tx.co.jp (smtp02.silk.ntt-tx.co.jp [10.107.0.37]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id vBS4u9pl011232 for unknown; Thu, 28 Dec 2017 13:56:09 +0900 Message-Id: <201712280456.vBS4u9pl011232@imss03.silk.ntt-tx.co.jp> Received: from localhost by mgate01.silk.ntt-tx.co.jp (unknown) id vBS4u4b5025622 ; Thu, 28 Dec 2017 13:56:06 +0900 From: x-fn-spp@sl.ntt-tx.co.jp To: spp@dpdk.org Date: Thu, 28 Dec 2017 13:55:38 +0900 X-Mailer: git-send-email 1.9.1 In-Reply-To: <4aae78ff-3b6c-cdfe-a8b7-24ec08b73935@lab.ntt.co.jp> References: <4aae78ff-3b6c-cdfe-a8b7-24ec08b73935@lab.ntt.co.jp> X-TM-AS-MML: No Subject: [spp] [PATCH 31/57] spp_vf: use prediction keywords X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 04:56:17 -0000 From: Hiroyuki Nakamura * Add branch prediction keyword(likely/unlikely) according to DPDK coding style. * Add and modify logging procedures. Signed-off-by: Daiki Yamashita Signed-off-by: Yasufum Ogawa --- src/vf/command_conn.c | 17 ++++++++++------- src/vf/command_proc.c | 8 +++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/vf/command_conn.c b/src/vf/command_conn.c index 98a7e27..ae60c4b 100644 --- a/src/vf/command_conn.c +++ b/src/vf/command_conn.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -45,7 +46,7 @@ spp_connect_to_controller(int *sock) /* create socket */ RTE_LOG(INFO, SPP_COMMAND_PROC, "Creating socket...\n"); *sock = socket(AF_INET, SOCK_STREAM, 0); - if (*sock < 0) { + if (unlikely(*sock < 0)) { RTE_LOG(ERR, SPP_COMMAND_PROC, "Cannot create tcp socket. errno=%d\n", errno); return -1; @@ -60,7 +61,7 @@ spp_connect_to_controller(int *sock) RTE_LOG(INFO, SPP_COMMAND_PROC, "Trying to connect ... socket=%d\n", *sock); ret = connect(*sock, (struct sockaddr *)&controller_addr, sizeof(controller_addr)); - if (ret < 0) { + if (unlikely(ret < 0)) { RTE_LOG(ERR, SPP_COMMAND_PROC, "Cannot connect to controller. errno=%d\n", errno); close(*sock); @@ -89,11 +90,11 @@ spp_receive_message(int *sock, char **strbuf) size_t rx_buf_sz = MESSAGE_BUFFER_BLOCK_SIZE; ret = recv(*sock, rx_buf, rx_buf_sz, 0); - if (ret <= 0) { - if (ret == 0) { + if (unlikely(ret <= 0)) { + if (likely(ret == 0)) { RTE_LOG(INFO, SPP_COMMAND_PROC, "Controller has performed an shutdown."); - } else if (errno == EAGAIN || errno == EWOULDBLOCK) { + } else if (likely(errno == EAGAIN || errno == EWOULDBLOCK)) { /* no receive message */ return 0; } else { @@ -101,7 +102,7 @@ spp_receive_message(int *sock, char **strbuf) "Receive failure. errno=%d\n", errno); } - RTE_LOG(INFO, SPP_COMMAND_PROC, "Assume Server closed connection\n"); + RTE_LOG(INFO, SPP_COMMAND_PROC, "Assume Server closed connection.\n"); close(*sock); *sock = -1; return -1; @@ -112,7 +113,9 @@ spp_receive_message(int *sock, char **strbuf) new_strbuf = spp_strbuf_append(*strbuf, rx_buf, n_rx); if (unlikely(new_strbuf == NULL)) { - return -1; + RTE_LOG(ERR, SPP_COMMAND_PROC, + "Cannot allocate memory for receive data.\n"); + rte_exit(-1, "Cannot allocate memory for receive data.\n"); } *strbuf = new_strbuf; diff --git a/src/vf/command_proc.c b/src/vf/command_proc.c index f0a1e79..fafb007 100644 --- a/src/vf/command_proc.c +++ b/src/vf/command_proc.c @@ -404,8 +404,14 @@ spp_command_proc_do(void) static size_t rb_cnt = 0; static size_t lb_cnt = 0; - if (unlikely(msgbuf == NULL)) + if (unlikely(msgbuf == NULL)) { msgbuf = spp_strbuf_allocate(CMD_REQ_BUF_INIT_SIZE); + if (unlikely(msgbuf == NULL)) { + RTE_LOG(ERR, SPP_COMMAND_PROC, + "Cannot allocate memory for receive data(init).\n"); + rte_exit(-1, "Cannot allocate memory for receive data(init).\n"); + } + } ret = spp_connect_to_controller(&sock); if (unlikely(ret != 0)) -- 1.9.1