From patchwork Wed Jun 1 03:27:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihong Wang X-Patchwork-Id: 13132 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7DB1A5A66; Wed, 1 Jun 2016 12:34:08 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id C8EE25A64 for ; Wed, 1 Jun 2016 12:34:06 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 01 Jun 2016 03:33:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,400,1459839600"; d="scan'208";a="978591198" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.244]) by fmsmga001.fm.intel.com with ESMTP; 01 Jun 2016 03:33:18 -0700 From: Zhihong Wang To: dev@dpdk.org Cc: konstantin.ananyev@intel.com, bruce.richardson@intel.com, pablo.de.lara.guarch@intel.com, thomas.monjalon@6wind.com, Zhihong Wang Date: Tue, 31 May 2016 23:27:43 -0400 Message-Id: <1464751663-135211-6-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464751663-135211-1-git-send-email-zhihong.wang@intel.com> References: <1462488421-118990-1-git-send-email-zhihong.wang@intel.com> <1464751663-135211-1-git-send-email-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 5/5] testpmd: show topology at forwarding start X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch show topology at forwarding start. "show config fwd" also does this, but showing it directly can reduce the possibility of misconfiguration. Signed-off-by: Zhihong Wang Acked-by: Pablo de Lara --- app/test-pmd/cmdline.c | 2 +- app/test-pmd/config.c | 4 ++-- app/test-pmd/testpmd.c | 2 +- app/test-pmd/testpmd.h | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index ef66d4e..bc800f8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -5445,7 +5445,7 @@ static void cmd_showcfg_parsed(void *parsed_result, else if (!strcmp(res->what, "cores")) fwd_lcores_config_display(); else if (!strcmp(res->what, "fwd")) - fwd_config_display(); + fwd_config_setup_display(); else if (!strcmp(res->what, "txpkts")) show_tx_pkt_segments(); } diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index cfdacd8..c70f308 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1383,7 +1383,7 @@ icmp_echo_config_setup(void) } } -void +static void fwd_config_setup(void) { cur_fwd_config.fwd_eng = cur_fwd_eng; @@ -1443,7 +1443,7 @@ pkt_fwd_config_display(struct fwd_config *cfg) void -fwd_config_display(void) +fwd_config_setup_display(void) { fwd_config_setup(); pkt_fwd_config_display(&cur_fwd_config); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 9b1d99c..b946034 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1009,7 +1009,7 @@ start_packet_forwarding(int with_tx_first) if(!no_flush_rx) flush_fwd_rx_queues(); - fwd_config_setup(); + fwd_config_setup_display(); rxtx_config_display(); for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 62ec055..5fd08e8 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -480,9 +480,8 @@ void port_infos_display(portid_t port_id); void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void tx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void fwd_lcores_config_display(void); -void fwd_config_display(void); +void fwd_config_setup_display(void); void rxtx_config_display(void); -void fwd_config_setup(void); void set_def_fwd_config(void); void reconfig(portid_t new_port_id, unsigned socket_id); int init_fwd_streams(void);