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 7D8A1A046B for ; Wed, 26 Jun 2019 07:36:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 759541B955; Wed, 26 Jun 2019 07:36:10 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id BC00B1B955 for ; Wed, 26 Jun 2019 07:36:08 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id z75so633132pgz.5 for ; Tue, 25 Jun 2019 22:36:08 -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=gyeGH6yJscEbrWy4gW3lASbdZ4NKKJCEOWZhMe+nyM4=; b=ISU9FtYe/IN6vDyuMqeX8aWC3nX8VEJEHNe7arF0Wtmjn9QERhY0e1CDGGBiYmAAsZ QJKa2Le9iTMaEYVlkwG51wQZfwVcukVxshH6s7AFoU5gGay1ufiyY2o/wfUPstjwNqh0 dY8hyAKAIb7F7rwd3Fbf2CBYYJa/At7DgFX1Y/e9O+VbDyU1fCL9J4OUI6CvXjh7qg4C rGnyAEU/IM+tZf7vSxGSamcxHgKh5LhLkpjG3PUELM+dfL46Zq/iyeArEUhiIhsftaEZ e3lDM9s1t2AWP81dhsimsve9USD+3VZma3V4WhNs75ozlG5UegPEAuyqZg0UxgG9HLow /O2A== 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=gyeGH6yJscEbrWy4gW3lASbdZ4NKKJCEOWZhMe+nyM4=; b=SN2gMOqY/KHfpBg/yB7iPKNehHLBGQHL+x3fdVhXVgfdK/4W7wP2R0iIO5OndQLXh5 a1pLLdSa8xAwhmT+gBMghKfQgpWDkfiebHSlPfR1VwTMvqjDgv7wpB7LWa3XB12pnY6+ ngCt+MME4TlSspew4g5GPCVP6W6R4ZlFtsKjadz8ukqzYAAzS5ghkxLYyRo4lN9q8SoY 3HVBKHE6TfZ+/mRHmNtDZeIK3pJqLjDK4OZRKhtzuJmh+J/UFlrugumYPoFsWj4/wXbM t2QgqhoCD3dWqClj+sno1IoAUw0QMwrfN9DOn+z9wLt/A2guHDWMDssV3Yni7L6/Mo33 8Wng== X-Gm-Message-State: APjAAAXMEr5h+oHyVag4ORkjCA7K2nsx8FLpQxuHAiSNx8rD1Rzak2rS Uzj5FcR1gP4NQWLvtMdlTC+pCxj9 X-Google-Smtp-Source: APXvYqxT7kLHEtp33DribsRH3mL3ncXT9VywMsFQY7XIhyZ2VO6EbxR/0XWwwvPXMZSWgEzaYFaV1Q== X-Received: by 2002:a17:90a:bd93:: with SMTP id z19mr2422025pjr.49.1561527367799; Tue, 25 Jun 2019 22:36:07 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id u1sm15315180pgr.94.2019.06.25.22.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jun 2019 22:36:07 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Wed, 26 Jun 2019 14:35:58 +0900 Message-Id: <20190626053558.39847-3-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190626053558.39847-1-yasufum.o@gmail.com> References: <20190626053558.39847-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 2/2] spp_pcap: remove global var g_startup_param 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 for spp_pcap is the same as previous one for removing global `g_startup_param`. Signed-off-by: Yasufumi Ogawa --- src/pcap/cmd_runner.c | 8 +++----- src/pcap/cmd_utils.c | 13 +++---------- src/pcap/cmd_utils.h | 15 ++------------- src/pcap/spp_pcap.c | 15 +++------------ 4 files changed, 11 insertions(+), 40 deletions(-) diff --git a/src/pcap/cmd_runner.c b/src/pcap/cmd_runner.c index 4c1891e..48e8eba 100644 --- a/src/pcap/cmd_runner.c +++ b/src/pcap/cmd_runner.c @@ -373,7 +373,7 @@ append_capture_status_value(const char *name, char **output, { int *capture_status = NULL; - spp_get_mng_data_addr(NULL, NULL, NULL, NULL, &capture_status); + spp_get_mng_data_addr(NULL, NULL, NULL, &capture_status); return append_json_str_value(name, output, CAPTURE_STATUS_STRINGS[*capture_status]); @@ -797,15 +797,13 @@ send_command_result_response(int *sock, /* pcap start command */ if (request->is_requested_start) { - spp_get_mng_data_addr(NULL, NULL, NULL, - &capture_request, NULL); + spp_get_mng_data_addr(NULL, NULL, &capture_request, NULL); *capture_request = SPP_CAPTURE_RUNNING; } /* pcap stop command */ if (request->is_requested_stop) { - spp_get_mng_data_addr(NULL, NULL, NULL, - &capture_request, NULL); + spp_get_mng_data_addr(NULL, NULL, &capture_request, NULL); *capture_request = SPP_CAPTURE_IDLE; } diff --git a/src/pcap/cmd_utils.c b/src/pcap/cmd_utils.c index d9e09e5..52ca905 100644 --- a/src/pcap/cmd_utils.c +++ b/src/pcap/cmd_utils.c @@ -14,7 +14,6 @@ /* Manage data to addoress */ struct mng_data_info { - struct startup_param *p_startup_param; struct iface_info *p_iface_info; struct core_mng_info *p_core_info; int *p_capture_request; @@ -258,21 +257,18 @@ int spp_format_port_string(char *port, enum port_type iface_type, int iface_no) } /* Set mange data address */ -int spp_set_mng_data_addr(struct startup_param *startup_param_p, - struct iface_info *iface_p, +int spp_set_mng_data_addr(struct iface_info *iface_p, struct core_mng_info *core_mng_p, int *capture_request_p, int *capture_status_p, unsigned int main_lcore_id) { - if (startup_param_p == NULL || iface_p == NULL || - core_mng_p == NULL || + if (iface_p == NULL || core_mng_p == NULL || capture_request_p == NULL || capture_status_p == NULL || main_lcore_id == 0xffffffff) return SPPWK_RET_NG; - g_mng_data_addr.p_startup_param = startup_param_p; g_mng_data_addr.p_iface_info = iface_p; g_mng_data_addr.p_core_info = core_mng_p; g_mng_data_addr.p_capture_request = capture_request_p; @@ -283,15 +279,12 @@ int spp_set_mng_data_addr(struct startup_param *startup_param_p, } /* Get manage data address */ -void spp_get_mng_data_addr(struct startup_param **startup_param_p, - struct iface_info **iface_p, +void spp_get_mng_data_addr(struct iface_info **iface_p, struct core_mng_info **core_mng_p, int **capture_request_p, int **capture_status_p) { - if (startup_param_p != NULL) - *startup_param_p = g_mng_data_addr.p_startup_param; if (iface_p != NULL) *iface_p = g_mng_data_addr.p_iface_info; if (core_mng_p != NULL) diff --git a/src/pcap/cmd_utils.h b/src/pcap/cmd_utils.h index 8281a3b..4fa2ea9 100644 --- a/src/pcap/cmd_utils.h +++ b/src/pcap/cmd_utils.h @@ -155,13 +155,6 @@ struct sppwk_comp_info { struct sppwk_port_info *tx_ports[RTE_MAX_ETHPORTS]; /**< tx ports */ }; -/* Manage given options as global variable */ -struct startup_param { - //int client_id; /* Client ID */ - char server_ip[INET_ADDRSTRLEN]; /* IP address of spp-ctl */ - int server_port; /* Port Number of spp-ctl */ -}; - /* Manage interfaces and port information as global variable */ /* TODO(yasufum) confirm why nof_rings is required not used in anywhere. */ struct iface_info { @@ -327,7 +320,6 @@ spp_format_port_string(char *port, enum port_type iface_type, int iface_no); /** * Set mange data address * - * @param startup_param_p Pointer to g_startup_param address. * @param iface_p Pointer to g_iface_info address. * @param core_mng_p Pointer to g_core_info address. * @param capture_status_p Pointer to status of pcap. @@ -336,8 +328,7 @@ spp_format_port_string(char *port, enum port_type iface_type, int iface_no); * @retval SPP_RET_OK If succeeded. * @retval SPP_RET_NG If failed. */ -int spp_set_mng_data_addr(struct startup_param *startup_param_p, - struct iface_info *iface_p, +int spp_set_mng_data_addr(struct iface_info *iface_p, struct core_mng_info *core_mng_p, int *capture_request_p, int *capture_status_p, @@ -346,14 +337,12 @@ int spp_set_mng_data_addr(struct startup_param *startup_param_p, /** * Get mange data address * - * @param startup_param_p Pointer to startup params. * @param iface_p Pointer to g_iface_info. * @param core_mng_p Pointer to g_core_mng_info. * @param capture_request_p Pointer to status of pcap. * @param capture_status_p Pointer to req of pcap. */ -void spp_get_mng_data_addr(struct startup_param **startup_param_p, - struct iface_info **iface_p, +void spp_get_mng_data_addr(struct iface_info **iface_p, struct core_mng_info **core_mng_p, int **capture_request_p, int **capture_status_p); diff --git a/src/pcap/spp_pcap.c b/src/pcap/spp_pcap.c index b69ffdd..0b846f3 100644 --- a/src/pcap/spp_pcap.c +++ b/src/pcap/spp_pcap.c @@ -132,9 +132,6 @@ struct pcap_status_info { /* Lcore ID of main thread. */ static unsigned int g_main_lcore_id = 0xffffffff; -/* Arguments for spp_pcap process. */ -static struct startup_param g_startup_param; - /* Interface management information */ static struct iface_info g_iface_info; @@ -273,9 +270,6 @@ parse_app_args(int argc, char *argv[]) for (cnt = 0; cnt < argcopt; cnt++) argvopt[cnt] = argv[cnt]; - /* Clear startup parameters */ - memset(&g_startup_param, 0x00, sizeof(g_startup_param)); - /* option parameters init */ memset(&g_pcap_option, 0x00, sizeof(g_pcap_option)); strcpy(g_pcap_option.compress_file_path, DEFAULT_OUTPUT_DIR); @@ -940,12 +934,9 @@ main(int argc, char *argv[]) g_main_lcore_id = rte_lcore_id(); /* set manage address */ - if (spp_set_mng_data_addr(&g_startup_param, - &g_iface_info, - g_core_info, - &g_capture_request, - &g_capture_status, - g_main_lcore_id) < 0) { + if (spp_set_mng_data_addr(&g_iface_info, g_core_info, + &g_capture_request, &g_capture_status, + g_main_lcore_id) < 0) { RTE_LOG(ERR, SPP_PCAP, "manage address set is failed.\n"); break; -- 2.17.1