From patchwork Sat Nov 22 21:43:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 1453 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 C25ED7FB8; Sat, 22 Nov 2014 22:33:47 +0100 (CET) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id 403DC7F94 for ; Sat, 22 Nov 2014 22:33:42 +0100 (CET) Received: by mail-wg0-f48.google.com with SMTP id y19so9325785wgg.7 for ; Sat, 22 Nov 2014 13:44:22 -0800 (PST) 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=40bBrVRg6PizziVbKixTVgSqeRKjMrGTHA0zbT9pY2o=; b=ks+Imx/1cW/eNzPUDh1s7DcYa0YsN3vpNOf5mmm4pDNnVjUgdDuU5OgYSFaDERIPa8 fkTX+Jk0SVTnimu5cRzSoFkO+yjXZJfQbGBs7E79GV89WfkV3nyB0ym3+YFJ+jj/kQgN 5srgt82Ga9PbQhiB6DToEXJAa65R/rmtW1VlaNXcAM35Mjz+yA+hBgHApT3YuwUVswda vMebdFhSU9uMsd7ZDwKWZ84Cfj2imfddz2udGzJ8Y4Ny58FZ/FC5HYSTlD8mZyvwIg/6 Q4lHSfOWz9mAeUYXNfbjIbg4ib86ma64e8MuvvxO+J1U/r0OlTa8C1kMlYFC2UqOvJV1 weaw== X-Gm-Message-State: ALoCoQlIB0RRCRqyyFyXvD3zIeuT/Vut3C/9nZdEn9wkUujs6ao58qXsYQWyQm31Smf31mu9qGhs X-Received: by 10.180.83.37 with SMTP id n5mr8382171wiy.83.1416692662815; Sat, 22 Nov 2014 13:44:22 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id cz3sm13724087wjb.23.2014.11.22.13.44.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Nov 2014 13:44:22 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Sat, 22 Nov 2014 22:43:36 +0100 Message-Id: <1416692622-28886-5-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1416692622-28886-1-git-send-email-thomas.monjalon@6wind.com> References: <1416692622-28886-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 04/10] eal: factorize internal config reset 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" Now that internal config structure is common to Linux and BSD, we can have a common function to initialize it. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- lib/librte_eal/bsdapp/eal/eal.c | 24 +------------------ lib/librte_eal/common/eal_common_options.c | 37 ++++++++++++++++++++++++++++++ lib/librte_eal/common/eal_internal_cfg.h | 2 ++ lib/librte_eal/linuxapp/eal/eal.c | 28 +--------------------- 4 files changed, 41 insertions(+), 50 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index ca99cb9..391ce53 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -321,29 +321,7 @@ eal_parse_args(int argc, char **argv) argvopt = argv; - internal_config.memory = 0; - internal_config.force_nrank = 0; - internal_config.force_nchannel = 0; - internal_config.hugefile_prefix = HUGEFILE_PREFIX_DEFAULT; - internal_config.hugepage_dir = NULL; - internal_config.force_sockets = 0; - internal_config.syslog_facility = LOG_DAEMON; - /* default value from build option */ - internal_config.log_level = RTE_LOG_LEVEL; -#ifdef RTE_LIBEAL_USE_HPET - internal_config.no_hpet = 0; -#else - internal_config.no_hpet = 1; -#endif - /* zero out the NUMA config */ - for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - internal_config.socket_mem[i] = 0; - - /* zero out hugedir descriptors */ - for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) - internal_config.hugepage_info[i].lock_descriptor = 0; - - internal_config.vmware_tsc_map = 0; + eal_reset_internal_config(&internal_config); while ((opt = getopt_long(argc, argvopt, eal_short_options, eal_long_options, &option_index)) != EOF) { diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 7a5d55e..ffc615a 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -47,6 +47,7 @@ #include "eal_internal_cfg.h" #include "eal_options.h" +#include "eal_filesystem.h" #define BITS_PER_HEX 4 @@ -84,6 +85,42 @@ eal_long_options[] = { {0, 0, 0, 0} }; +void +eal_reset_internal_config(struct internal_config *internal_cfg) +{ + int i; + + internal_cfg->memory = 0; + internal_cfg->force_nrank = 0; + internal_cfg->force_nchannel = 0; + internal_cfg->hugefile_prefix = HUGEFILE_PREFIX_DEFAULT; + internal_cfg->hugepage_dir = NULL; + internal_cfg->force_sockets = 0; + /* zero out the NUMA config */ + for (i = 0; i < RTE_MAX_NUMA_NODES; i++) + internal_cfg->socket_mem[i] = 0; + /* zero out hugedir descriptors */ + for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) + internal_cfg->hugepage_info[i].lock_descriptor = -1; + internal_cfg->base_virtaddr = 0; + + internal_cfg->syslog_facility = LOG_DAEMON; + /* default value from build option */ + internal_cfg->log_level = RTE_LOG_LEVEL; + + internal_cfg->xen_dom0_support = 0; + + /* if set to NONE, interrupt mode is determined automatically */ + internal_cfg->vfio_intr_mode = RTE_INTR_MODE_NONE; + +#ifdef RTE_LIBEAL_USE_HPET + internal_cfg->no_hpet = 0; +#else + internal_cfg->no_hpet = 1; +#endif + internal_cfg->vmware_tsc_map = 0; +} + /* * Parse the coremask given as argument (hexadecimal string) and fill * the global configuration (core role and core count) with the parsed diff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h index 19c84e7..a80aeab 100644 --- a/lib/librte_eal/common/eal_internal_cfg.h +++ b/lib/librte_eal/common/eal_internal_cfg.h @@ -88,4 +88,6 @@ struct internal_config { }; extern struct internal_config internal_config; /**< Global EAL configuration. */ +void eal_reset_internal_config(struct internal_config *internal_cfg); + #endif diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 7a1d087..bb35669 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -513,33 +513,7 @@ eal_parse_args(int argc, char **argv) argvopt = argv; - internal_config.memory = 0; - internal_config.force_nrank = 0; - internal_config.force_nchannel = 0; - internal_config.hugefile_prefix = HUGEFILE_PREFIX_DEFAULT; - internal_config.hugepage_dir = NULL; - internal_config.force_sockets = 0; - internal_config.syslog_facility = LOG_DAEMON; - /* default value from build option */ - internal_config.log_level = RTE_LOG_LEVEL; - internal_config.xen_dom0_support = 0; - /* if set to NONE, interrupt mode is determined automatically */ - internal_config.vfio_intr_mode = RTE_INTR_MODE_NONE; -#ifdef RTE_LIBEAL_USE_HPET - internal_config.no_hpet = 0; -#else - internal_config.no_hpet = 1; -#endif - /* zero out the NUMA config */ - for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - internal_config.socket_mem[i] = 0; - - /* zero out hugedir descriptors */ - for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) - internal_config.hugepage_info[i].lock_descriptor = -1; - - internal_config.vmware_tsc_map = 0; - internal_config.base_virtaddr = 0; + eal_reset_internal_config(&internal_config); while ((opt = getopt_long(argc, argvopt, eal_short_options, eal_long_options, &option_index)) != EOF) {