From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 8A7AD38EB for ; Tue, 25 Nov 2014 11:20:42 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 25 Nov 2014 02:31:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,455,1413270000"; d="scan'208";a="637709923" Received: from bricha3-mobl3.ger.corp.intel.com ([10.243.20.15]) by fmsmga002.fm.intel.com with SMTP; 25 Nov 2014 02:30:13 -0800 Received: by (sSMTP sendmail emulation); Tue, 25 Nov 2014 10:30:12 +0025 Date: Tue, 25 Nov 2014 10:30:12 +0000 From: Bruce Richardson To: Thomas Monjalon Message-ID: <20141125103012.GD5260@bricha3-MOBL3> References: <1416692622-28886-1-git-send-email-thomas.monjalon@6wind.com> <1416692622-28886-5-git-send-email-thomas.monjalon@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1416692622-28886-5-git-send-email-thomas.monjalon@6wind.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: dev@dpdk.org Subject: Re: [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: , X-List-Received-Date: Tue, 25 Nov 2014 10:20:43 -0000 On Sat, Nov 22, 2014 at 10:43:36PM +0100, Thomas Monjalon wrote: > 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) { > -- > 2.1.3 >