From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH 02/11] shared/sec: revise enum for cmd response
Date: Fri, 31 May 2019 12:35:56 +0900 [thread overview]
Message-ID: <1559273765-26130-3-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <1559273765-26130-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp>
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
This update is to revise the name of enum `command_result_code` and its
members.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
.../secondary/spp_worker_th/cmd_runner.c | 52 +++++++++----------
1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/shared/secondary/spp_worker_th/cmd_runner.c b/src/shared/secondary/spp_worker_th/cmd_runner.c
index 74b41dd..1908c8c 100644
--- a/src/shared/secondary/spp_worker_th/cmd_runner.c
+++ b/src/shared/secondary/spp_worker_th/cmd_runner.c
@@ -21,37 +21,33 @@
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER2
/* request message initial size */
-#define CMD_RES_ERR_MSG_SIZE 128
-#define CMD_TAG_APPEND_SIZE 16
+#define CMD_ERR_MSG_LEN 128
+#define CMD_TAG_APPEND_SIZE 16
#define CMD_REQ_BUF_INIT_SIZE 2048
#define CMD_RES_BUF_INIT_SIZE 2048
#define COMMAND_RESP_LIST_EMPTY { "", NULL }
+/* TODO(yasufum) revise later `JSON_*`. */
#define JSON_COMMA ", "
+/* TODO(yasufum) confirm why using "" for the alternative of comma? */
#define JSON_APPEND_COMMA(flg) ((flg)?JSON_COMMA:"")
#define JSON_APPEND_VALUE(format) "%s\"%s\": "format
#define JSON_APPEND_ARRAY "%s\"%s\": [ %s ]"
#define JSON_APPEND_BLOCK "%s\"%s\": { %s }"
#define JSON_APPEND_BLOCK_NONAME "%s%s{ %s }"
-/* command execution result code */
-enum command_result_code {
- CRES_SUCCESS = 0,
- CRES_FAILURE,
- CRES_INVALID,
+enum cmd_res_codes {
+ CMD_SUCCESS = 0,
+ CMD_FAILED,
+ CMD_INVALID,
};
/* command execution result information */
struct command_result {
- /* Response code */
- int code;
-
- /* Response message */
- char result[SPPWK_NAME_BUFSZ];
-
- /* Detailed response message */
- char error_message[CMD_RES_ERR_MSG_SIZE];
+ int code; /* Response code. */
+ char result[SPPWK_NAME_BUFSZ]; /* Response msg in short. */
+ char error_message[CMD_ERR_MSG_LEN]; /* Detailed response msg. */
};
/* command response list control structure */
@@ -846,18 +842,18 @@ set_command_results(struct command_result *result,
{
result->code = code;
switch (code) {
- case CRES_SUCCESS:
+ case CMD_SUCCESS:
strcpy(result->result, "success");
- memset(result->error_message, 0x00, CMD_RES_ERR_MSG_SIZE);
+ memset(result->error_message, 0x00, CMD_ERR_MSG_LEN);
break;
- case CRES_FAILURE:
+ case CMD_FAILED:
strcpy(result->result, "error");
strcpy(result->error_message, error_messege);
break;
- case CRES_INVALID: /* FALLTHROUGH */
+ case CMD_INVALID:
default:
strcpy(result->result, "invalid");
- memset(result->error_message, 0x00, CMD_RES_ERR_MSG_SIZE);
+ memset(result->error_message, 0x00, CMD_ERR_MSG_LEN);
break;
}
}
@@ -870,19 +866,19 @@ prepare_parse_err_msg(struct command_result *results,
{
int i;
const char *tmp_buff;
- char error_messege[CMD_RES_ERR_MSG_SIZE];
+ char error_messege[CMD_ERR_MSG_LEN];
for (i = 0; i < request->num_command; i++) {
if (wk_err_msg->code == 0)
- set_command_results(&results[i], CRES_SUCCESS, "");
+ set_command_results(&results[i], CMD_SUCCESS, "");
else
- set_command_results(&results[i], CRES_INVALID, "");
+ set_command_results(&results[i], CMD_INVALID, "");
}
if (wk_err_msg->code != 0) {
tmp_buff = get_parse_err_msg(wk_err_msg, error_messege);
set_command_results(&results[request->num_valid_command],
- CRES_FAILURE, tmp_buff);
+ CMD_FAILED, tmp_buff);
}
}
@@ -1678,24 +1674,24 @@ process_request(int *sock, const char *request_str, size_t request_str_len)
for (i = 0; i < request.num_command ; ++i) {
ret = execute_command(request.commands + i);
if (unlikely(ret != SPP_RET_OK)) {
- set_command_results(&command_results[i], CRES_FAILURE,
+ set_command_results(&command_results[i], CMD_FAILED,
"error occur");
/* not execute remaining commands */
for (++i; i < request.num_command ; ++i)
set_command_results(&command_results[i],
- CRES_INVALID, "");
+ CMD_INVALID, "");
break;
}
- set_command_results(&command_results[i], CRES_SUCCESS, "");
+ set_command_results(&command_results[i], CMD_SUCCESS, "");
}
if (request.is_requested_exit) {
/* Terminated by process exit command. */
/* Other route is normal end because it responds to command. */
- set_command_results(&command_results[0], CRES_SUCCESS, "");
+ set_command_results(&command_results[0], CMD_SUCCESS, "");
send_command_result_response(sock, &request, command_results);
RTE_LOG(INFO, SPP_COMMAND_PROC,
"Terminate process for exit.\n");
--
2.17.1
next prev parent reply other threads:[~2019-05-31 3:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 3:35 [spp] [PATCH 00/11] Refactor functions for handling commands ogawa.yasufumi
2019-05-31 3:35 ` [spp] [PATCH 01/11] shared/sec: rename functions of sppwk_cmd_runner ogawa.yasufumi
2019-05-31 3:35 ` ogawa.yasufumi [this message]
2019-05-31 3:35 ` [spp] [PATCH 03/11] shared/sec: refactor passing err in cmd_runner ogawa.yasufumi
2019-05-31 3:35 ` [spp] [PATCH 04/11] shared/sec: rename struct for command response ogawa.yasufumi
2019-05-31 3:35 ` [spp] [PATCH 05/11] shared/sec: refactor funcs for managing port info ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 06/11] shared/sec: rename util functions in cmd_runner ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 07/11] shared/sec: rename func for getting component ID ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 08/11] shared/sec: refactor func for updating cls table ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 09/11] shared/sec: rename func for executing command ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 10/11] shared/sec: add helpers for logging cmd parser ogawa.yasufumi
2019-05-31 3:36 ` [spp] [PATCH 11/11] shared/sec: rename func for updating port ogawa.yasufumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1559273765-26130-3-git-send-email-ogawa.yasufumi@lab.ntt.co.jp \
--to=ogawa.yasufumi@lab.ntt.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).