From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by dpdk.org (Postfix) with ESMTP id 0CEC56895 for ; Thu, 15 May 2014 11:35:11 +0200 (CEST) Received: by mail-wi0-f177.google.com with SMTP id f8so3835593wiw.16 for ; Thu, 15 May 2014 02:35:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ARUgZWq0Go4jVVpAfcRDbfyY3iOawoOSGgehA4nUVHE=; b=ZbhkwuDQ9KHMlGUJPCrPQsrYCQBMF7yLZ1qqdVZ4mX9epxQZq8LtbR51roFXfFNQIY tcVBxYUyXPmKFRnaz1R4Fgy4HE4jfZS0rOiU28IapW296mhLi1H6Omt5eyb8vQj6W3/P NrY7P295qFipLxvZDf/FOtfOkdNh9YDOeLFIM1wkQMUAANkl6r+8zlQ1Fkm1EAQdtKBc zknSrsBoF2N5jhFjzLaEVK0Wq4FgxBTTs9LMNuFW/J4d8VByNh7hOJmNFcrW73ST/HvO pJxcpy7ynPxdsGDdr0RUPeVO1aEIY4Sgtj3PonqjLClv7XQn4fO0BquLY1mky6DwyfGh drKg== X-Gm-Message-State: ALoCoQlkP/3isfsV1R7nmtncQsQki3/9VpFrpeD3YSTNaQxcy0Ms2ykhmu1+ZhY8QTuUxHEYpuAK X-Received: by 10.180.7.227 with SMTP id m3mr7651693wia.59.1400146519637; Thu, 15 May 2014 02:35:19 -0700 (PDT) Received: from XPS13.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id be6sm6045437wjb.41.2014.05.15.02.35.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 May 2014 02:35:18 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 15 May 2014 11:35:13 +0200 Message-Id: <1400146513-14283-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400087113-5270-1-git-send-email-thomas.monjalon@6wind.com> References: <1400087113-5270-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2] app/testpmd: list forwarding modes 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: , X-List-Received-Date: Thu, 15 May 2014 09:35:12 -0000 Having a function to list forwarding modes helps to show them in cli help and in parameters usage witout duplicating code. Signed-off-by: Thomas Monjalon --- app/test-pmd/cmdline.c | 55 ++++++++++++++++++++++++++++------------------- app/test-pmd/config.c | 19 ++++++++++++++++ app/test-pmd/parameters.c | 3 ++- app/test-pmd/testpmd.h | 1 + 4 files changed, 55 insertions(+), 23 deletions(-) changes in v2: - factorize also contextual help diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 7f59333..12a09d0 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -294,17 +294,9 @@ static void cmd_help_long_parsed(void *parsed_result, " bit 3 - insert sctp checksum offload if set\n" " Please check the NIC datasheet for HW limits.\n\n" -#ifdef RTE_LIBRTE_IEEE1588 - "set fwd (io|mac|mac_retry|rxonly|txonly|csum|ieee1588)\n" - " Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY or ieee1588" - " packet forwarding mode.\n\n" + "set fwd (%s)\n" + " Set packet forwarding mode.\n\n" -#else - "set fwd (io|mac|mac_retry|rxonly|txonly|csum)\n" - " Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY packet" - " forwarding mode.\n\n" - -#endif "mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n" " Add a MAC address on port_id.\n\n" @@ -398,6 +390,7 @@ static void cmd_help_long_parsed(void *parsed_result, " using the lowest port on the NIC.\n\n" #endif + , list_pkt_forwarding_modes() ); } @@ -2688,22 +2681,12 @@ cmdline_parse_token_string_t cmd_setfwd_fwd = TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, fwd, "fwd"); cmdline_parse_token_string_t cmd_setfwd_mode = TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, mode, -#ifdef RTE_LIBRTE_IEEE1588 - "io#mac#mac_retry#rxonly#txonly#csum#ieee1588"); -#else - "io#mac#mac_retry#rxonly#txonly#csum"); -#endif + "" /* defined at init */); cmdline_parse_inst_t cmd_set_fwd_mode = { .f = cmd_set_fwd_mode_parsed, .data = NULL, -#ifdef RTE_LIBRTE_IEEE1588 - .help_str = "set fwd io|mac|mac_retry|rxonly|txonly|csum|ieee1588 - set IO, MAC," - " MAC_RETRY, RXONLY, TXONLY, CSUM or IEEE1588 packet forwarding mode", -#else - .help_str = "set fwd io|mac|mac_retry|rxonly|txonly|csum - set IO, MAC," - " MAC_RETRY, RXONLY, CSUM or TXONLY packet forwarding mode", -#endif + .help_str = NULL, /* defined at init */ .tokens = { (void *)&cmd_setfwd_set, (void *)&cmd_setfwd_fwd, @@ -2712,6 +2695,26 @@ cmdline_parse_inst_t cmd_set_fwd_mode = { }, }; +static void cmd_set_fwd_mode_init(cmdline_parse_inst_t *cmd) +{ + char *modes, *c; + static char token[128]; + static char help[256]; + + modes = list_pkt_forwarding_modes(); + rte_snprintf(help, sizeof help, "set fwd %s - " + "set packet forwarding mode", modes); + cmd->help_str = help; + + /* string token separator is # */ + for (c = token; *modes != '\0'; modes++) + if (*modes == '|') + *c++ = '#'; + else + *c++ = *modes; + ((cmdline_parse_token_string_t *)cmd->tokens[2])->string_data.str = token; +} + /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */ struct cmd_set_burst_tx_retry_result { cmdline_fixed_string_t set; @@ -5197,6 +5200,14 @@ void prompt(void) { struct cmdline *cl; + unsigned i = 0; + cmdline_parse_inst_t *cmd; + + /* initialize non-constant commands */ + while ((cmd = main_ctx[i++]) != NULL) { + if (cmd->f == cmd_set_fwd_mode_parsed) + cmd_set_fwd_mode_init(cmd); + } cl = cmdline_stdin_new(main_ctx, "testpmd> "); if (cl == NULL) { diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index d0e21b7..2e4b7a5 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1231,6 +1231,25 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs) tx_pkt_nb_segs = (uint8_t) nb_segs; } +char* +list_pkt_forwarding_modes(void) +{ + static char modes[128] = ""; + const char *separator = "|"; + struct fwd_engine *fwd_eng; + unsigned i = 0; + + if (strlen (modes) == 0) { + while ((fwd_eng = fwd_engines[i++]) != NULL) { + strcat(modes, fwd_eng->fwd_mode_name); + strcat(modes, separator); + } + modes[strlen(modes) - strlen(separator)] = '\0'; + } + + return modes; +} + void set_pkt_forwarding_mode(const char *fwd_mode_name) { diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 67081d7..8a3ce2c 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -158,7 +158,8 @@ usage(char* progname) printf(" --disable-rss: disable rss.\n"); printf(" --port-topology=N: set port topology (N: paired (default) or " "chained).\n"); - printf(" --forward-mode=N: set forwarding mode.\n"); + printf(" --forward-mode=N: set forwarding mode (N: %s).\n", + list_pkt_forwarding_modes()); printf(" --rss-ip: set RSS functions to IPv4/IPv6 only .\n"); printf(" --rss-udp: set RSS functions to IPv4/IPv6 + UDP.\n"); printf(" --rxq=N: set the number of RX queues per port to N.\n"); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 52d3543..0e4a35e 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -491,6 +491,7 @@ void tx_cksum_set(portid_t port_id, uint8_t cksum_mask); void set_verbose_level(uint16_t vb_level); void set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs); void set_nb_pkt_per_burst(uint16_t pkt_burst); +char *list_pkt_forwarding_modes(void); void set_pkt_forwarding_mode(const char *fwd_mode); void start_packet_forwarding(int with_tx_first); void stop_packet_forwarding(void); -- 1.9.2