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 BA2C1A046B for ; Mon, 24 Jun 2019 12:41:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AD76E1BED8; Mon, 24 Jun 2019 12:41:50 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id ED0D91BED0 for ; Mon, 24 Jun 2019 12:41:49 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id t16so7257475pfe.11 for ; Mon, 24 Jun 2019 03:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=uoGaV6QOl1mfmDoFaJW2BeEtIm1QoWH9JfogYzL88oY=; b=CZKn2RcnbhFVOmFLXCZNwi1BOiCKxqvQ6SWoH5myvhBmvYjXMyipYxh13VnqP1MANP PDsPzDu5UPduxGVZp9uaQkTwbbM/toK4B358+e/6kkFjBl6hoT/n0IAeIuPTff5PE8sj xwBMFah6Oo2IbZ7PXefcfgWaCgwI18WYNu/2Zj4zE7AUgb1InaP+LyTP2MXvc6SatgBs KaXvH6HFL/HlSccSRe6hVSIAnbRvL4HwHFBRmAo88KlIZSbStXiEEAqD8jxjCauxLvFp jwfIs77UIzPLPynYFddA2mG+CzrZUA7xdg7rhcAOjuIdamWIa9NZI4pp4aCuplf+OEiI PvgQ== 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; bh=uoGaV6QOl1mfmDoFaJW2BeEtIm1QoWH9JfogYzL88oY=; b=l34Y2ylRZLv9ahJS9au3AGnBua/gCoFgpvjeqyZU4iGIRB1fJJyd/aLhmSWFNQk0L2 AhG59SG0yDjtqPT2LiBLx8WtYIlJWXV7PdDXFH8jICSgiby05bTp/wQ3BwPVgbO1ijCW HdzsD9kyy7djmGWiZwiLiv/MIZKW1rCzjC4+lYwj9/u0TCtD0Tq4FeN6UABZFgneOQYG jkS0fuJdyfU9FP7TAK6HBOwFrfmVOH0xcZ2hhBWezZioqWVL4s1dBaUo5S9hD77omuMF k0oKC5f5bJugQK7J+esPGWCThrJEgSRC0lGll5ikZY1LHIJNqgOzXzItOW7HEIETnBVR i64A== X-Gm-Message-State: APjAAAUG0yGTOLlWEEAiIwCU9992rA++pUSMeTuRrWR3+0dFfwvJYgiI RSMZrXyUEy7+J81rYBzl3MXi0DnU X-Google-Smtp-Source: APXvYqzKkFTXqrX/25PuwVUMuol/6R6JWDfYXqm9bZ8f/sKZLTjjtIhk+vgb6WlBPClRK2KPvPDxDw== X-Received: by 2002:a63:595e:: with SMTP id j30mr13092106pgm.2.1561372908774; Mon, 24 Jun 2019 03:41:48 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id d123sm14365330pfc.144.2019.06.24.03.41.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 03:41:48 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 24 Jun 2019 19:41:44 +0900 Message-Id: <20190624104144.24869-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] shared/sec: remove worker process type 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 Three of SPP worker process types are defined as an enum for vf, mirror and none. It is only used as index for getting name of types of string value from an array. enum sppwk_proc_type { WK_PROC_TYPE_NONE, WK_PROC_TYPE_VF, WK_PROC_TYPE_MIRROR, } However, it is menaingless because type for vf is not used in spp_mirror, or vise versa. In addition, type none is not used from anywhere. It should be simply replaced with fixed string values in each of processes because it is not needed to be shared among processes. This update is to replace this enum and array of string with `#define WK_PROC_TYPE "vf"` and `#define WK_PROC_TYPE "mirror"` in each of processes independently. Signed-off-by: Yasufumi Ogawa --- src/mirror/spp_mirror.c | 12 +++------ .../spp_worker_th/cmd_res_formatter.c | 25 +------------------ .../secondary/spp_worker_th/cmd_utils.h | 9 ------- .../secondary/spp_worker_th/mirror_deps.h | 2 ++ src/shared/secondary/spp_worker_th/vf_deps.h | 2 ++ src/vf/spp_vf.c | 10 +++----- 6 files changed, 12 insertions(+), 48 deletions(-) diff --git a/src/mirror/spp_mirror.c b/src/mirror/spp_mirror.c index 19d79ef..9d9b4a8 100644 --- a/src/mirror/spp_mirror.c +++ b/src/mirror/spp_mirror.c @@ -194,15 +194,11 @@ parse_app_args(int argc, char *argv[]) usage(progname); return SPP_RET_NG; } - g_startup_param.wk_proc_type = WK_PROC_TYPE_MIRROR; RTE_LOG(INFO, MIRROR, - "app opts (client_id=%d,type=%d," - "server=%s:%d,vhost_client=%d,)\n", - cli_id, - g_startup_param.wk_proc_type, - g_startup_param.server_ip, - g_startup_param.server_port, - g_enable_vhost_cli); + "Parsed app args (client_id=%d, server=%s:%d, " + "vhost_client=%d,)\n", + cli_id, g_startup_param.server_ip, + g_startup_param.server_port, g_enable_vhost_cli); return SPP_RET_OK; } 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 291c1f5..f095b08 100644 --- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c +++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c @@ -21,18 +21,6 @@ static int append_result_value(const char *name, char **output, void *tmp); static int append_error_details_value(const char *name, char **output, void *tmp); -/** - * List of worker process type. The order of items should be same as the order - * of enum `wk_proc_type` in cmd_utils.h. - */ -/* TODO(yasufum) Add "pcap" after spp_pcap is made to use shared. */ -const char *SPPWK_PROC_TYPE_LIST[] = { - "none", - "vf", - "mirror", - "", /* termination */ -}; - /** * List of port abilities. The order of items should be same as the order of * enum `sppwk_port_abl_ops` in spp_vf.h. @@ -121,23 +109,12 @@ append_interface_array(char **output, const enum port_type type) return SPP_RET_OK; } -/* TODO(yasufum) move to another file for util funcs. */ -/* Get proc type from global command params. */ -static int -get_wk_type(void) -{ - struct startup_param *params; - sppwk_get_mng_data(¶ms, NULL, NULL, NULL, NULL, NULL, NULL); - return params->wk_proc_type; -} - /* append a secondary process type for JSON format */ int append_process_type_value(const char *name, char **output, void *tmp __attribute__ ((unused))) { - return append_json_str_value(output, name, - SPPWK_PROC_TYPE_LIST[get_wk_type()]); + return append_json_str_value(output, name, SPPWK_PROC_TYPE); } /* append a value of vlan for JSON format */ diff --git a/src/shared/secondary/spp_worker_th/cmd_utils.h b/src/shared/secondary/spp_worker_th/cmd_utils.h index 9022589..425d3eb 100644 --- a/src/shared/secondary/spp_worker_th/cmd_utils.h +++ b/src/shared/secondary/spp_worker_th/cmd_utils.h @@ -134,14 +134,6 @@ enum copy_mng_flg { COPY_MNG_FLG_ALLCOPY, }; -/* secondary process type used only from spp_vf and spp_mirror */ -/* TODO(yasufum) Add WK_PROC_TYPE_PCAP. */ -enum sppwk_proc_type { - WK_PROC_TYPE_NONE, - WK_PROC_TYPE_VF, - WK_PROC_TYPE_MIRROR, -}; - /** VLAN tag information */ struct sppwk_vlan_tag { int vid; /**< VLAN ID */ @@ -203,7 +195,6 @@ struct sppwk_comp_info { struct startup_param { char server_ip[INET_ADDRSTRLEN]; /* IP address of spp-ctl */ int server_port; /* Port Number of spp-ctl */ - enum sppwk_proc_type wk_proc_type; }; /* Manage number of interfaces and port information as global variable. */ diff --git a/src/shared/secondary/spp_worker_th/mirror_deps.h b/src/shared/secondary/spp_worker_th/mirror_deps.h index 1446027..085b01e 100644 --- a/src/shared/secondary/spp_worker_th/mirror_deps.h +++ b/src/shared/secondary/spp_worker_th/mirror_deps.h @@ -9,6 +9,8 @@ #include "cmd_parser.h" #include "cmd_res_formatter.h" +#define SPPWK_PROC_TYPE "mirror" + /* Num of entries of ops_list in mir_cmd_runner.c. */ #define NOF_STAT_OPS 7 diff --git a/src/shared/secondary/spp_worker_th/vf_deps.h b/src/shared/secondary/spp_worker_th/vf_deps.h index 8da81a5..fd3c201 100644 --- a/src/shared/secondary/spp_worker_th/vf_deps.h +++ b/src/shared/secondary/spp_worker_th/vf_deps.h @@ -11,6 +11,8 @@ #include "cmd_parser.h" #include "cmd_res_formatter.h" +#define SPPWK_PROC_TYPE "vf" + /* Number of VLAN ID */ #define NOF_VLAN 4096 diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c index d8b0c87..f4bafb4 100644 --- a/src/vf/spp_vf.c +++ b/src/vf/spp_vf.c @@ -151,15 +151,11 @@ parse_app_args(int argc, char *argv[]) usage(progname); return SPP_RET_NG; } - g_startup_param.wk_proc_type = WK_PROC_TYPE_VF; RTE_LOG(INFO, APP, - "app opts (client_id=%d,type=%d,server=%s:%d," + "Parsed app args (client_id=%d,server=%s:%d," "vhost_client=%d)\n", - cli_id, - g_startup_param.wk_proc_type, - g_startup_param.server_ip, - g_startup_param.server_port, - g_enable_vhost_cli); + cli_id, g_startup_param.server_ip, + g_startup_param.server_port, g_enable_vhost_cli); return SPP_RET_OK; } -- 2.17.1