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 3F160A046B for ; Mon, 24 Jun 2019 12:44:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 384CC1BF1E; Mon, 24 Jun 2019 12:44:22 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 3B2211BF1E for ; Mon, 24 Jun 2019 12:44:20 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id z19so3942955pgl.12 for ; Mon, 24 Jun 2019 03:44:20 -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=8Br02rRFtz3iXoWJfwieb/OcPsYKT9sF6Zh70xzdLMI=; b=ALG/454U+Bq87oBpkFKzM6GZovnB6P98C/35w+ez1klvB+reOXewKZtNz3CqVesP3M 06aB8+Soz3zL12v6spb7ka4qY0+dklA1w5cCOlAcgDOjH0OHKfiURuUl5TnJVacMzo8d 7dW+wog9oS0FZQJDbYrd89UI73cEgztLzYuUfxVafuqy9RjGJzO+II0fNFRk6HsoU+2I Cp/akaVzZ45mdF6FKAOTZoSe5VBiMunTaNQ2Pthaoab3YLneyKUDECoerqCjSQfelomb ccjqijmUtkrvduOycjJqCoQRtNtpM6dyEqvFDKbCgL1mGW7GH1U6i5GNJTSxaQaa+KUQ /dVQ== 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=8Br02rRFtz3iXoWJfwieb/OcPsYKT9sF6Zh70xzdLMI=; b=bRmG8hu0fafzAGrmIGnABHUjbc1q6iQ+rTZxFcOQmS4GhVWYfWfLf0uq+SRNxAwPmi d+gX7EeSOaPKGvFLKR8vUp2o5NJ4Is9TlJfnzL56uKZYdn+kDR54DdBfT9oKaX/XX8Gq 40AitO40YNg6EFyY3w/OappgO62eyO3YF64C+MB0wMSyaVub2ypVp/quuNGIreB36BLt ZAm4ulaRjtIaMnTHtimUQDtg0hgz/guiTI8ZgJ6s2lo2+OHTkZVl+B/OC/0qv3kfhUtn tIYEfp8CkRl90vn+MkX7XlpGrWPjzSzXQpI+kNnt5LU8Qy4IKkpZ4lEz5RsgiuLV/NnI 4Evw== X-Gm-Message-State: APjAAAXBfyusVRDvwsXqy7Qa3mEanAhsDciykawMEUxPoUhRH+5OOTIg 0KBPoIAJgLHbADf2HmsLpnNjObab X-Google-Smtp-Source: APXvYqxZdaqBkQcxsg3CWarzj1eC3y+BBQ0P4yf7XYj8xa5+kUSgan4/nw8bse2d1L2FnKoCx5pT/g== X-Received: by 2002:a17:90a:2244:: with SMTP id c62mr24550702pje.29.1561373059819; Mon, 24 Jun 2019 03:44:19 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id r9sm10093635pgv.24.2019.06.24.03.44.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jun 2019 03:44:19 -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:44:09 +0900 Message-Id: <20190624104411.24977-3-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190624104411.24977-1-yasufum.o@gmail.com> References: <20190624104411.24977-1-yasufum.o@gmail.com> Subject: [spp] [PATCH 2/4] spp_vf: remove global vars of spp-ctl IP and port 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 is to remove global `startup_params` from spp_vf, and change to use getter and setter for IP addr and port of spp-ctl. Signed-off-by: Yasufumi Ogawa --- src/shared/common.c | 4 +-- src/vf/spp_vf.c | 60 +++++++++++++++++---------------------------- 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/src/shared/common.c b/src/shared/common.c index a195929..b261fb0 100644 --- a/src/shared/common.c +++ b/src/shared/common.c @@ -122,11 +122,11 @@ int get_sec_dir(char *proc_name, char *dir_name) /* Get IP address of spp_ctl as string. */ int get_spp_ctl_ip(char *s_ip) { - sprintf(s_ip, "%s", spp_ctl_ip); if (spp_ctl_ip == NULL) { - RTE_LOG(ERR, SHARED, "Failed to get IP of spp_ctl.\n"); + RTE_LOG(ERR, SHARED, "IP addr of spp_ctl not initialized.\n"); return -1; } + sprintf(s_ip, "%s", spp_ctl_ip); return 0; } diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c index f4bafb4..d8098f2 100644 --- a/src/vf/spp_vf.c +++ b/src/vf/spp_vf.c @@ -57,44 +57,24 @@ usage(const char *progname) , progname); } -/* Parse options for server IP and port */ -static int -parse_app_server(const char *server_str, char *server_ip, int *server_port) -{ - const char delim[2] = ":"; - unsigned int pos = 0; - int port = 0; - char *endptr = NULL; - - pos = strcspn(server_str, delim); - if (pos >= strlen(server_str)) - return SPP_RET_NG; - - port = strtol(&server_str[pos+1], &endptr, 0); - if (unlikely(&server_str[pos+1] == endptr) || - unlikely(*endptr != '\0')) - return SPP_RET_NG; - - memcpy(server_ip, server_str, pos); - server_ip[pos] = '\0'; - *server_port = port; - RTE_LOG(DEBUG, APP, "Set server IP = %s\n", server_ip); - RTE_LOG(DEBUG, APP, "Set server port = %d\n", *server_port); - return SPP_RET_OK; -} - /* Parse options for client app */ static int parse_app_args(int argc, char *argv[]) { + int cli_id; /* Client ID. */ + char *ctl_ip; /* IP address of spp_ctl. */ + int ctl_port; /* Port num to connect spp_ctl. */ + int ret; int cnt; - int cli_id; + int option_index, opt; + int proc_flg = 0; int server_flg = 0; - int option_index, opt; + const int argcopt = argc; char *argvopt[argcopt]; const char *progname = argv[0]; + static struct option lgopts[] = { { "client-id", required_argument, NULL, SPP_LONGOPT_RETVAL_CLIENT_ID }, @@ -132,9 +112,10 @@ parse_app_args(int argc, char *argv[]) g_enable_vhost_cli = 1; break; case 's': - if (parse_app_server(optarg, g_startup_param.server_ip, - &g_startup_param.server_port) != - SPP_RET_OK) { + ret = parse_server(&ctl_ip, &ctl_port, optarg); + set_spp_ctl_ip(ctl_ip); + set_spp_ctl_port(ctl_port); + if (ret != SPP_RET_OK) { usage(progname); return SPP_RET_NG; } @@ -154,8 +135,7 @@ parse_app_args(int argc, char *argv[]) RTE_LOG(INFO, APP, "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); + cli_id, ctl_ip, ctl_port, g_enable_vhost_cli); return SPP_RET_OK; } @@ -222,6 +202,11 @@ int main(int argc, char *argv[]) { int ret = SPP_RET_NG; + char ctl_ip[IPADDR_LEN] = { 0 }; + int ctl_port; + int ret_cmd_init; + unsigned int lcore_id = 0; + #ifdef SPP_DEMONIZE /* Daemonize process */ int ret_daemon = daemon(0, 0); @@ -274,10 +259,10 @@ main(int argc, char *argv[]) spp_port_ability_init(); /* Setup connection for accepting commands from controller */ - int ret_command_init = sppwk_cmd_runner_conn( - g_startup_param.server_ip, - g_startup_param.server_port); - if (unlikely(ret_command_init != SPP_RET_OK)) + get_spp_ctl_ip(ctl_ip); + ctl_port = get_spp_ctl_port(); + ret_cmd_init = sppwk_cmd_runner_conn(ctl_ip, ctl_port); + if (unlikely(ret_cmd_init != SPP_RET_OK)) break; #ifdef SPP_RINGLATENCYSTATS_ENABLE @@ -289,7 +274,6 @@ main(int argc, char *argv[]) #endif /* SPP_RINGLATENCYSTATS_ENABLE */ /* Start worker threads of classifier and forwarder */ - unsigned int lcore_id = 0; RTE_LCORE_FOREACH_SLAVE(lcore_id) { rte_eal_remote_launch(slave_main, NULL, lcore_id); } -- 2.17.1