From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C0592A046B for ; Mon, 24 Jun 2019 06:36:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4D541BF2C; Mon, 24 Jun 2019 06:36:56 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 4CE311BF2C for ; Mon, 24 Jun 2019 06:36:55 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id s27so6415629pgl.2 for ; Sun, 23 Jun 2019 21:36:55 -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=VGJNAWTkSfVsUKkc1g4mQumERqpnwm3FOeSnJwFbkdU=; b=JB5hnjDIVCm5ZSKTC0IPlmQjD5P7IIe7hBi0qCPLs/LjQvf5kspRd3KubsypAmqVDi o/oDtvn8wUvOPbDvtClTSZwTEH2BOOrHD1r9POA2Zps3rDVY3h58UjBCK20hMX5RIkYi wklrCdNN9ObJFCJCFLW2w/5vHOfr1zcv9tVXxNLqMwz3/Yka5+/FK9mdw8+IoNGjlLOc 39/+f3YwlKy6Grb9DvBxeDzOtyD7pB41tvr67Wx5a7nD+g0a0z0EF1K92VUv2p7ILCGL WYEiWzoOqdGURIuHgJbUNwOTCE0GkqItzd6UNHczbxEJQJVEaIFfqSllEeIOXhdOd08p bNnQ== 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=VGJNAWTkSfVsUKkc1g4mQumERqpnwm3FOeSnJwFbkdU=; b=pVTdOAaGZChiTGdSXIkTg4YEuujj6j+CJhsLro+0tpsyyJ5rj2mqglO+H0vnbIapMJ uLC3GvRfwNn2hZQRqWnghigsAFI/XnE16JC3AqyjfrwBCrNW9+8ioD5CMN5MaP5327dp V/25OS03/fzzBTtaZXAckdDfSBXeZZn3bLR1Vxkoli3SIoITWVFlmYxALYaeIQ1xor/q hXf97Lyw6sA7vZwDYgYH1GYKJCrHwKZAFwIcAUPkvDXBRRZw5B/hoh3BphfAnppaDMow 6tXi9Sp0ShppwNwjpyqok2nDXpc1jM/uWOMIps5MZTUQOEY6cD1sWdX4bj0TmO80Os3i /B5w== X-Gm-Message-State: APjAAAXshUeNnqaK82Fb0P3UyOHlvshPgqSNnhTQzIFdNvgDK6pN3AZz ZgYbZhRpaGnFW+483pIHd/pnAPUF X-Google-Smtp-Source: APXvYqy0B9ihML5A/Pn7NQYLV7JGD0z56Wv9+OpSPYUMJW2mTy25KiEaQWqx071TK6EU19jKOfc4fA== X-Received: by 2002:a17:90a:bf08:: with SMTP id c8mr22353410pjs.75.1561351014431; Sun, 23 Jun 2019 21:36:54 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id c10sm9005178pjq.14.2019.06.23.21.36.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jun 2019 21:36:54 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 24 Jun 2019 13:36:10 +0900 Message-Id: <20190624043613.19271-11-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190624043613.19271-1-yasufum.o@gmail.com> References: <20190624043613.19271-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 10/13] shared/sec: move ope cli-id in response_info_list 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 This update is to move operation functions `add_client_id` and `add_interface` which is defined in `cmd_runner.c` to `cmd_res_formatter.c`. Signed-off-by: Yasufumi Ogawa --- .../spp_worker_th/cmd_res_formatter.c | 57 +++++++++++++++++++ .../spp_worker_th/cmd_res_formatter.h | 11 ++++ .../secondary/spp_worker_th/cmd_runner.c | 52 ----------------- 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c index d838a18..3476580 100644 --- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c +++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c @@ -597,6 +597,63 @@ spp_iterate_core_info(struct spp_iterate_core_params *params) return SPP_RET_OK; } +/* TODO(yasufum) move to another file for util funcs. */ +/* Get client ID from global command params. */ +static int +wk_get_client_id(void) +{ + struct startup_param *params; + sppwk_get_mng_data(¶ms, NULL, NULL, NULL, NULL, NULL, NULL); + return params->client_id; +} + +/** + * Operator functions start with prefix `add_` defined in `response_info_list` + * of struct `cmd_response` which are for making each of parts of command + * response. + */ +/* Add entry of client ID to a response in JSON. */ +int +add_client_id(const char *name, char **output, + void *tmp __attribute__ ((unused))) +{ + return append_json_int_value(output, name, wk_get_client_id()); +} + +/* Add entry of port to a response in JSON such as "phy:0". */ +int +add_interface(const char *name, char **output, + void *tmp __attribute__ ((unused))) +{ + int ret = SPP_RET_NG; + char *tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE); + if (unlikely(tmp_buff == NULL)) { + RTE_LOG(ERR, WK_CMD_RES_FMT, + /* TODO(yasufum) refactor no meaning err msg */ + "allocate error. (name = %s)\n", + name); + return SPP_RET_NG; + } + + if (strcmp(name, SPP_IFTYPE_NIC_STR) == 0) + ret = append_interface_array(&tmp_buff, PHY); + + else if (strcmp(name, SPP_IFTYPE_VHOST_STR) == 0) + ret = append_interface_array(&tmp_buff, VHOST); + + else if (strcmp(name, SPP_IFTYPE_RING_STR) == 0) + ret = append_interface_array(&tmp_buff, RING); + + if (unlikely(ret < SPP_RET_OK)) { + spp_strbuf_free(tmp_buff); + return SPP_RET_NG; + } + + ret = append_json_array_brackets(output, name, tmp_buff); + spp_strbuf_free(tmp_buff); + return ret; +} + /* Add entry of master lcore to a response in JSON. */ int add_master_lcore(const char *name, char **output, diff --git a/src/shared/secondary/spp_worker_th/cmd_res_formatter.h b/src/shared/secondary/spp_worker_th/cmd_res_formatter.h index 9c77763..bc0109c 100644 --- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.h +++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.h @@ -72,6 +72,17 @@ int append_response_list_value(char **output, struct cmd_response *responses, int append_command_results_value(const char *name, char **output, int num, struct cmd_result *results); +/** + * Operator functions start with prefix `add_` defined in `response_info_list` + * of struct `cmd_response` which are for making each of parts of command + * response. + */ +int add_client_id(const char *name, char **output, + void *tmp __attribute__ ((unused))); + +int add_interface(const char *name, char **output, + void *tmp __attribute__ ((unused))); + int add_master_lcore(const char *name, char **output, void *tmp __attribute__ ((unused))); diff --git a/src/shared/secondary/spp_worker_th/cmd_runner.c b/src/shared/secondary/spp_worker_th/cmd_runner.c index a6894fc..007d62e 100644 --- a/src/shared/secondary/spp_worker_th/cmd_runner.c +++ b/src/shared/secondary/spp_worker_th/cmd_runner.c @@ -29,16 +29,6 @@ enum cmd_res_code { CMD_INVALID, }; -/* TODO(yasufum) move to another file for util funcs. */ -/* Get client ID from global command params. */ -static int -sppwk_get_client_id(void) -{ - struct startup_param *params; - sppwk_get_mng_data(¶ms, NULL, NULL, NULL, NULL, NULL, NULL); - return params->client_id; -} - /* Update classifier table with given action, add or del. */ static int update_cls_table(enum sppwk_action wk_action, @@ -582,48 +572,6 @@ prepare_parse_err_msg(struct cmd_result *results, } } -/* Add entry of client ID to a response in JSON. */ -static int -add_client_id(const char *name, char **output, - void *tmp __attribute__ ((unused))) -{ - return append_json_int_value(output, name, sppwk_get_client_id()); -} - -/* Add entry of port to a response in JSON such as "phy:0". */ -static int -add_interface(const char *name, char **output, - void *tmp __attribute__ ((unused))) -{ - int ret = SPP_RET_NG; - char *tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE); - if (unlikely(tmp_buff == NULL)) { - RTE_LOG(ERR, WK_CMD_RUNNER, - /* TODO(yasufum) refactor no meaning err msg */ - "allocate error. (name = %s)\n", - name); - return SPP_RET_NG; - } - - if (strcmp(name, SPP_IFTYPE_NIC_STR) == 0) - ret = append_interface_array(&tmp_buff, PHY); - - else if (strcmp(name, SPP_IFTYPE_VHOST_STR) == 0) - ret = append_interface_array(&tmp_buff, VHOST); - - else if (strcmp(name, SPP_IFTYPE_RING_STR) == 0) - ret = append_interface_array(&tmp_buff, RING); - - if (unlikely(ret < SPP_RET_OK)) { - spp_strbuf_free(tmp_buff); - return SPP_RET_NG; - } - - ret = append_json_array_brackets(output, name, tmp_buff); - spp_strbuf_free(tmp_buff); - return ret; -} - #ifdef SPP_VF_MODULE /** * Add entries of classifier table in JSON. Before iterating the entries, -- 2.17.1