From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0635.ocn.ad.jp (mogw0635.ocn.ad.jp [153.149.228.36]) by dpdk.org (Postfix) with ESMTP id 284A21AEEB for ; Wed, 6 Dec 2017 09:19:45 +0100 (CET) Received: from mf-smf-ucb001.ocn.ad.jp (mf-smf-ucb001.ocn.ad.jp [153.149.227.3]) by mogw0635.ocn.ad.jp (Postfix) with ESMTP id 46C651180237; Wed, 6 Dec 2017 17:19:43 +0900 (JST) Received: from mf-smf-ucb001.ocn.ad.jp (mf-smf-ucb001 [153.149.227.3]) by mf-smf-ucb001.ocn.ad.jp (Postfix) with ESMTP id 297CE205F6; Wed, 6 Dec 2017 17:19:43 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb021 (mv-mta-ucb021.ocn.ad.jp [153.149.142.84]) by mf-smf-ucb001.ocn.ad.jp (Switch-3.3.4/Switch-3.3.4) with ESMTP id vB68Jgug061144; Wed, 6 Dec 2017 17:19:42 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.167]) by ntt.pod01.mv-mta-ucb021 with id iYKi1w0073dLKTM01YKiST; Wed, 06 Dec 2017 08:19:42 +0000 Received: from localhost.localdomain (sp49-98-150-93.msd.spmode.ne.jp [49.98.150.93]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Wed, 6 Dec 2017 17:19:42 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org Cc: ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp, gerald.rogers@intel.com, sy.jong.choi@intel.com Date: Wed, 6 Dec 2017 17:18:22 +0900 Message-Id: <20171206081826.67688-3-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20171206081826.67688-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20171206081826.67688-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH 3/7] spp_primary: change type of ports_id to uint16_t 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: , X-List-Received-Date: Wed, 06 Dec 2017 08:19:45 -0000 From: Yasufumi Ogawa Type of ID and number of ports managed in primary is uint8 while it is changed from uint8_t to uint16_t in DPDK 17.11. This update is to change type of ID and number of ports to uint16_t. It also includes updates for common functions called from primary. Signed-off-by: Yasufumi Ogawa --- src/primary/args.c | 2 +- src/primary/args.h | 2 +- src/primary/init.c | 3 ++- src/primary/main.c | 2 +- src/shared/common.c | 2 +- src/shared/common.h | 6 +++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/primary/args.c b/src/primary/args.c index 55433a1..a786d3a 100644 --- a/src/primary/args.c +++ b/src/primary/args.c @@ -66,7 +66,7 @@ usage(void) * on error. */ int -parse_app_args(uint8_t max_ports, int argc, char *argv[]) +parse_app_args(uint16_t max_ports, int argc, char *argv[]) { int option_index, opt; char **argvopt = argv; diff --git a/src/primary/args.h b/src/primary/args.h index 73e1f82..e290860 100644 --- a/src/primary/args.h +++ b/src/primary/args.h @@ -40,6 +40,6 @@ extern uint8_t num_clients; extern char *server_ip; extern int server_port; -int parse_app_args(uint8_t max_ports, int argc, char *argv[]); +int parse_app_args(uint16_t max_ports, int argc, char *argv[]); #endif /* ifndef _ARGS_H_ */ diff --git a/src/primary/init.c b/src/primary/init.c index 5ea21f9..7a15e9b 100644 --- a/src/primary/init.c +++ b/src/primary/init.c @@ -134,7 +134,8 @@ init(int argc, char *argv[]) { int retval; const struct rte_memzone *mz; - uint8_t i, total_ports; + uint8_t i; + uint16_t total_ports; /* init EAL, parsing EAL args */ retval = rte_eal_init(argc, argv); diff --git a/src/primary/main.c b/src/primary/main.c index 15fa53a..d3feef7 100644 --- a/src/primary/main.c +++ b/src/primary/main.c @@ -56,7 +56,7 @@ turn_off(int sig) } static const char * -get_printable_mac_addr(uint8_t port) +get_printable_mac_addr(uint16_t port) { static const char err_address[] = "00:00:00:00:00:00"; static char addresses[RTE_MAX_ETHPORTS][sizeof(err_address)]; diff --git a/src/shared/common.c b/src/shared/common.c index da73cfe..9455294 100644 --- a/src/shared/common.c +++ b/src/shared/common.c @@ -160,7 +160,7 @@ init_port(uint8_t port_num, struct rte_mempool *pktmbuf_pool) * array variable */ int -parse_portmask(struct port_info *ports, uint8_t max_ports, +parse_portmask(struct port_info *ports, uint16_t max_ports, const char *portmask) { char *end = NULL; diff --git a/src/shared/common.h b/src/shared/common.h index 27138bd..5b8d11d 100644 --- a/src/shared/common.h +++ b/src/shared/common.h @@ -108,8 +108,8 @@ struct stats { } __rte_cache_aligned; struct port_info { - uint8_t num_ports; - uint8_t id[RTE_MAX_ETHPORTS]; + uint16_t num_ports; + uint16_t id[RTE_MAX_ETHPORTS]; struct stats port_stats[RTE_MAX_ETHPORTS]; struct stats client_stats[MAX_CLIENT]; }; @@ -191,7 +191,7 @@ void check_all_ports_link_status(struct port_info *ports, uint8_t port_num, int init_port(uint8_t port_num, struct rte_mempool *pktmbuf_pool); -int parse_portmask(struct port_info *ports, uint8_t max_ports, +int parse_portmask(struct port_info *ports, uint16_t max_ports, const char *portmask); int parse_num_clients(uint8_t *num_clients, const char *clients); int parse_server(char **server_ip, int *server_port, char *server_addr); -- 2.13.1