From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4337EA046B for ; Mon, 22 Jul 2019 03:39:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3C2DB1B203; Mon, 22 Jul 2019 03:39:00 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 4F1AB1B203 for ; Mon, 22 Jul 2019 03:38:59 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id b3so18395358plr.4 for ; Sun, 21 Jul 2019 18:38:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=la1rrBDDZmugb4egPbxTgzncHNcIR03OtuypwUAGrew=; b=cJFPcY2gYbaj+y7BKAeR9DARek0/L5+HaJgXjrURE2PkF08v5z7DZQV8E9bxz2n/Ct a+1coBYJtC4uiFXahvE1sxxRI/kq07rzhquooBx/2w8bjwDznBuuTyRhQw4KFi+ajcL6 +zxo49JuddcbUk12VuksTpbisHETo9irzVu+hQnAee65fYOrzwGhDPExBjr5OBZKCL5t TNtMnC+lZCctJDAsVTE+lNLdr9z2I4clE4v1oTYBAeT0xdmfyvh/ADBcpFRyOgidGjRX lFW9rFrYJ7y+rLILYWQnPv7gbkk1e5IFy++gilKUstTcnpfnD0pVpFRT/mJA7nv03nj9 zocA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=la1rrBDDZmugb4egPbxTgzncHNcIR03OtuypwUAGrew=; b=R7K/COmjve/a3yC6ykd5n0khYpzVZN4+DxhvaAOW5RJul1opH5Krxm9B0e+WQKY3nc BR1idU5u6C8unbf9FWtZZ2aoHXGuruyLISBQu1ZGvOzzRNYLmQDLLg4zgxBb6mLi/Cwc mFGRGM88bicVN0Yl3mJoiDw7JWEMM8bvDwMAzy+j5sr0mL0FSIqHxqIHFET3aRiv977P hQll4svCkPfIN1wABqRAYKj3i0Pi28lq279nkxQGPhKH40I3A2nYkcie+OZC7Y6IDmrX MU8RFZpd2zNRMhtX+on9zo5RCC3iDEO9WwIak7ls8S9lnt76+OwlRK54yFUD5Ti0gjk9 Fntw== X-Gm-Message-State: APjAAAUR4DbazhcO8jgOD9yXE0WPL36sBCuPAYBPBwvffnSPTzpeSxCF UT3hRWERSgLYzoXG0vCJZNq3rS5F X-Google-Smtp-Source: APXvYqxCTDr/rcYtTjaZHvpVt9Mu3fm3bB4DaPVHxy7V18TPG5i2sUc9xTeUpG5kLTk+YBNh89lu4A== X-Received: by 2002:a17:902:6b07:: with SMTP id o7mr70859904plk.180.1563759538385; Sun, 21 Jul 2019 18:38:58 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id m31sm44509793pjb.6.2019.07.21.18.38.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jul 2019 18:38:58 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 22 Jul 2019 10:38:45 +0900 Message-Id: <20190722013846.18618-4-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190722013846.18618-1-yasufum.o@gmail.com> References: <20190722013846.18618-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 3/4] spp_pcap: unify return codes 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: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Yasufumi Ogawa Change return codes of SPP_RET_OK and SPP_RET_NG to SPPWK_RET_OK and SPPWK_RET_NG to unify the return codes. Signed-off-by: Yasufumi Ogawa --- src/pcap/cmd_runner.c | 7 ++++--- src/pcap/cmd_runner.h | 2 +- src/pcap/cmd_utils.h | 8 ++++---- src/pcap/spp_pcap.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/pcap/cmd_runner.c b/src/pcap/cmd_runner.c index 5754841..21de3f9 100644 --- a/src/pcap/cmd_runner.c +++ b/src/pcap/cmd_runner.c @@ -919,10 +919,10 @@ spp_command_proc_init(const char *ctl_ipaddr, int ctl_port) /* process command from controller. */ int -spp_command_proc_do(void) +sppwk_run_cmd(void) { - int ret = SPPWK_RET_NG; - int msg_ret = -1; + int ret; + int msg_ret; static int sock = -1; static char *msgbuf; @@ -938,6 +938,7 @@ spp_command_proc_do(void) } ret = conn_spp_ctl(&sock); + if (unlikely(ret != SPPWK_RET_OK)) return SPPWK_RET_OK; diff --git a/src/pcap/cmd_runner.h b/src/pcap/cmd_runner.h index 0e53081..6e2d404 100644 --- a/src/pcap/cmd_runner.h +++ b/src/pcap/cmd_runner.h @@ -37,6 +37,6 @@ spp_command_proc_init(const char *controller_ip, int controller_port); * (occurred connection failure, or received exit command) */ int -spp_command_proc_do(void); +sppwk_run_cmd(void); #endif /* _SPP_PCAP_CMD_RUNNER_H_ */ diff --git a/src/pcap/cmd_utils.h b/src/pcap/cmd_utils.h index fb8c300..31e4aeb 100644 --- a/src/pcap/cmd_utils.h +++ b/src/pcap/cmd_utils.h @@ -286,8 +286,8 @@ struct core_info *get_core_info(unsigned int lcore_id); * @param port String of port type to be converted. * @param iface_type Interface type. * @param iface_no Interface number. - * @retval SPP_RET_OK If succeeded. - * @retval SPP_RET_NG If failed. + * @retval SPPWK_RET_OK If succeeded. + * @retval SPPWK_RET_NG If failed. */ /* TODO(yasufum) consider to merge to shared. */ int @@ -316,8 +316,8 @@ spp_format_port_string(char *port, enum port_type iface_type, int iface_no); * @param core_mng_p Pointer to g_core_info address. * @param capture_status_p Pointer to status of pcap. * @param capture_request_p Pointer to req of pcap. - * @retval SPP_RET_OK If succeeded. - * @retval SPP_RET_NG If failed. + * @retval SPPWK_RET_OK If succeeded. + * @retval SPPWK_RET_NG If failed. */ int spp_set_mng_data_addr(struct iface_info *iface_p, struct core_mng_info *core_mng_p, diff --git a/src/pcap/spp_pcap.c b/src/pcap/spp_pcap.c index 39667d8..7459ba9 100644 --- a/src/pcap/spp_pcap.c +++ b/src/pcap/spp_pcap.c @@ -1056,7 +1056,7 @@ main(int argc, char *argv[]) while (likely(g_core_info[master_lcore].status != SPPWK_LCORE_REQ_STOP)) { /* Receive command */ - ret_do = spp_command_proc_do(); + ret_do = sppwk_run_cmd(); if (unlikely(ret_do != SPPWK_RET_OK)) break; -- 2.17.1