[spp] [PATCH 08/17] shared/sec: refactor commad type of SPP worker

[ogawa.yasufumi@lab.ntt.co.jp]

From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>

Refactor enum `spp_command_type`. Rename the name of enum to
`sppwk_cmd_type` and also each of members.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 .../secondary/spp_worker_th/cmd_parser.h      | 24 +++++++++++--------
 .../secondary/spp_worker_th/command_dec.c     |  6 ++---
 .../secondary/spp_worker_th/command_proc.c    |  8 +++----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/shared/secondary/spp_worker_th/cmd_parser.h b/src/shared/secondary/spp_worker_th/cmd_parser.h
index 965c99b..5922654 100644
--- a/src/shared/secondary/spp_worker_th/cmd_parser.h
+++ b/src/shared/secondary/spp_worker_th/cmd_parser.h
@@ -57,15 +57,19 @@ enum sppwk_action {
  * @attention This enumerated type must have the same order of command_list
  *            defined in command_dec.c
  */
-/* TODO(yasufum) refactor each name prefix `SPP_`. */
-enum spp_command_type {
-	SPP_CMDTYPE_CLASSIFIER_TABLE_MAC,
-	SPP_CMDTYPE_CLASSIFIER_TABLE_VLAN,
-	SPP_CMDTYPE_CLIENT_ID,  /**< get_client_id */
-	SPP_CMDTYPE_STATUS,  /**< status */
-	SPP_CMDTYPE_EXIT,  /**< exit */
-	SPP_CMDTYPE_COMPONENT,  /**< component */
-	SPP_CMDTYPE_PORT,  /**< port */
+/*
+ * TODO(yasufum) consider to divide because each of target of scope is
+ * different and not so understandable for usage. For example, worker is
+ * including classifier or it status.
+ */
+enum sppwk_cmd_type {
+	SPPWK_CMDTYPE_CLS_MAC,
+	SPPWK_CMDTYPE_CLS_VLAN,
+	SPPWK_CMDTYPE_CLIENT_ID,  /**< get_client_id */
+	SPPWK_CMDTYPE_STATUS,  /**< status */
+	SPPWK_CMDTYPE_EXIT,  /**< exit */
+	SPPWK_CMDTYPE_WORKER,  /**< worker thread */
+	SPPWK_CMDTYPE_PORT,  /**< port */
 };
 
 /* `classifier_table` command specific parameters. */
@@ -100,7 +104,7 @@ struct spp_command_port {
 };
 
 struct spp_command {
-	enum spp_command_type type; /**< command type */
+	enum sppwk_cmd_type type; /**< command type */
 
 	union {  /**< command descriptors */
 		struct spp_command_classifier_table classifier_table;
diff --git a/src/shared/secondary/spp_worker_th/command_dec.c b/src/shared/secondary/spp_worker_th/command_dec.c
index 519ce3a..7a65269 100644
--- a/src/shared/secondary/spp_worker_th/command_dec.c
+++ b/src/shared/secondary/spp_worker_th/command_dec.c
@@ -1107,13 +1107,13 @@ spp_command_decode_request(
 	/* check getter command */
 	for (i = 0; i < request->num_valid_command; ++i) {
 		switch (request->commands[i].type) {
-		case SPP_CMDTYPE_CLIENT_ID:
+		case SPPWK_CMDTYPE_CLIENT_ID:
 			request->is_requested_client_id = 1;
 			break;
-		case SPP_CMDTYPE_STATUS:
+		case SPPWK_CMDTYPE_STATUS:
 			request->is_requested_status = 1;
 			break;
-		case SPP_CMDTYPE_EXIT:
+		case SPPWK_CMDTYPE_EXIT:
 			request->is_requested_exit = 1;
 			break;
 		default:
diff --git a/src/shared/secondary/spp_worker_th/command_proc.c b/src/shared/secondary/spp_worker_th/command_proc.c
index 7fd5fcd..5ae34d0 100644
--- a/src/shared/secondary/spp_worker_th/command_proc.c
+++ b/src/shared/secondary/spp_worker_th/command_proc.c
@@ -739,8 +739,8 @@ execute_command(const struct spp_command *command)
 	int ret = SPP_RET_OK;
 
 	switch (command->type) {
-	case SPP_CMDTYPE_CLASSIFIER_TABLE_MAC:
-	case SPP_CMDTYPE_CLASSIFIER_TABLE_VLAN:
+	case SPPWK_CMDTYPE_CLS_MAC:
+	case SPPWK_CMDTYPE_CLS_VLAN:
 		RTE_LOG(INFO, SPP_COMMAND_PROC,
 				"Execute classifier_table command.\n");
 		ret = spp_update_classifier_table(
@@ -756,7 +756,7 @@ execute_command(const struct spp_command *command)
 		}
 		break;
 
-	case SPP_CMDTYPE_COMPONENT:
+	case SPPWK_CMDTYPE_WORKER:
 		RTE_LOG(INFO, SPP_COMMAND_PROC,
 				"Execute component command.\n");
 		ret = spp_update_component(
@@ -771,7 +771,7 @@ execute_command(const struct spp_command *command)
 		}
 		break;
 
-	case SPP_CMDTYPE_PORT:
+	case SPPWK_CMDTYPE_PORT:
 		RTE_LOG(INFO, SPP_COMMAND_PROC,
 				"Execute port command. (act = %d)\n",
 				command->spec.port.wk_action);
-- 
2.17.1