Commit e858a6cb authored by Junchao Zhang's avatar Junchao Zhang Committed by Pavan Balaji
Browse files

Rename mpich_params.{c,h} to mpich_cvars.{c,h}



Also change src/util/param/params.yml to src/util/cvar/cvars.yml,
maint/genparams to maint/gencvars
Signed-off-by: Pavan Balaji's avatarPavan Balaji <balaji@mcs.anl.gov>
parent e072e5ca
......@@ -224,8 +224,8 @@ Makefile.am-stamp
/src/binding/f90/Makefile.mk
# MPICH2 parameter handling
/src/include/mpich_params.h
/src/util/param/mpich_params.c
/src/include/mpich_cvars.h
/src/util/cvar/mpich_cvars.c
################################################################################
......
......@@ -842,8 +842,8 @@ echo "done"
# new parameter code
echo_n "Generating parameter handling code... "
if test -x maint/genparams -a "$do_getparms" = "yes" ; then
if ./maint/genparams ; then
if test -x maint/gencvars -a "$do_getparms" = "yes" ; then
if ./maint/gencvars ; then
echo "done"
else
echo "failed"
......
......@@ -25,7 +25,7 @@ dist_noinst_SCRIPTS += \
maint/gcovmerge.in \
maint/getcoverage.in \
maint/gen_subcfg_m4 \
maint/genparams \
maint/gencvars \
maint/genstates.in \
maint/getcoverage.in \
maint/local_perl/lib/YAML/Tiny.pm \
......
......@@ -7,7 +7,7 @@
# script TODO:
# - generate initialization function to read vals from env vars
# - deal with string escaping in generated C strings
# - sort/collate paramters by name/category
# - sort/collate cvars by name/category
use strict;
use warnings;
......@@ -46,12 +46,12 @@ my $alt_ns = "MPICH";
# deprecated prefix for backward compatibility
my $dep_ns = "MPIR_PARAM";
# parameter description file
my $cvar_file = "src/util/param/params.yml";
# cvar description file
my $cvar_file = "src/util/cvar/cvars.yml";
# output source files
my $header_file = "src/include/mpich_params.h";
my $c_file = "src/util/param/mpich_params.c";
my $header_file = "src/include/mpich_cvars.h";
my $c_file = "src/util/cvar/mpich_cvars.c";
my $readme_file = "README.envvar";
GetOptions(
......@@ -169,11 +169,11 @@ EOT
die "missing 'cvars', stopped" unless exists $cvars->{cvars};
print CVAR_HDR <<EOT;
/* initializes parameter values from the environment */
/* initializes cvar values from the environment */
int ${fn_ns}_init(void);
int ${fn_ns}_finalize(void);
/* extern declarations for each parameter
/* extern declarations for each cvar
* (definitions in $c_file) */
EOT
......@@ -448,7 +448,7 @@ print CVAR_HDR <<EOT;
/* arbitrary, simplifies interaction with external interfaces like MPI_T_ */
#define ${uc_ns}_MAX_STRLEN (4096)
/* helper macros for safely getting the default value of a parameter */
/* helper macros for safely getting the default value of a cvar */
EOT
print CVAR_HDR <<EOT;
......@@ -470,7 +470,7 @@ close(CVAR_README);
########################################################################
# helper subroutines
# transform a parameter type to a C-language type
# transform a cvar type to a C-language type
sub type2ctype {
my $type = shift;
my %typemap = (
......@@ -492,11 +492,11 @@ sub fmt_default {
my $type = shift;
if (defined($literalval)) {
die "Both \"default\" and \"defaultliteral\" fields were specified for parameter \"$name\", stopped" if defined($val);
die "Both \"default\" and \"defaultliteral\" fields were specified for cvar \"$name\", stopped" if defined($val);
return qq($literalval);
}
die "Exactly one of \"default\" or \"defaultliteral\" fields must be specified for parameter \"$name\", stopped" unless defined($val);
die "Exactly one of \"default\" or \"defaultliteral\" fields must be specified for cvar \"$name\", stopped" unless defined($val);
if ($type eq "string") {
$val =~ s/"/\\"/g;
......
......@@ -34,7 +34,7 @@ noinst_HEADERS += \
src/include/mpiallstates.h \
src/include/mpibase.h \
src/include/mpibsend.h \
src/include/mpich_params.h \
src/include/mpich_cvars.h \
src/include/mpichconfconst.h \
src/include/mpidbg.h \
src/include/mpierror.h \
......@@ -67,5 +67,5 @@ noinst_HEADERS += \
src/include/oputil.h \
src/include/mpiinfo.h
src/include/mpich_params.h: src/util/param/params.yml
$(top_srcdir)/maint/genparams
src/include/mpich_cvars.h: src/util/cvar/cvars.yml
$(top_srcdir)/maint/gencvars
......@@ -3715,8 +3715,8 @@ int MPID_VCR_Get_lpid(MPID_VCR vcr, int * lpid_ptr);
file (mpiimpl.h). */
#include "mpidpost.h"
/* tunable parameter values */
#include "mpich_params.h"
/* tunable cvar values */
#include "mpich_cvars.h"
/* Tags for point to point operations which implement collective and other
internal operations */
......
......@@ -24,7 +24,7 @@ CPLUSPLUS_BEGIN
#include "mpibase.h"
#include "mpiutil.h"
#include "mpitypedefs.h"
#include "mpich_params.h"
#include "mpich_cvars.h"
/* implementation specific header file */
#include "mpidu_socki.h"
......
......@@ -11,7 +11,7 @@ include $(top_srcdir)/src/util/logging/Makefile.mk
include $(top_srcdir)/src/util/mem/Makefile.mk
include $(top_srcdir)/src/util/msgs/Makefile.mk
include $(top_srcdir)/src/util/other/Makefile.mk
include $(top_srcdir)/src/util/param/Makefile.mk
include $(top_srcdir)/src/util/cvar/Makefile.mk
include $(top_srcdir)/src/util/procmap/Makefile.mk
include $(top_srcdir)/src/util/thread/Makefile.mk
include $(top_srcdir)/src/util/wrappers/Makefile.mk
......
......@@ -6,12 +6,12 @@
##
lib_lib@MPILIBNAME@_la_SOURCES += \
src/util/param/mpich_params.c
src/util/cvar/mpich_cvars.c
dist_noinst_DATA += src/util/param/params.yml
dist_noinst_DATA += src/util/cvar/cvars.yml
if MAINTAINER_MODE
# normally built by autogen.sh, but this rebuild rule is here
$(top_srcdir)/src/util/param/mpich_params.c: $(top_srcdir)/src/util/param/params.yml $(top_srcdir)/maint/genparams
( cd $(top_srcdir) && ./maint/genparams )
$(top_srcdir)/src/util/cvar/mpich_cvars.c: $(top_srcdir)/src/util/cvar/cvars.yml $(top_srcdir)/maint/gencvars
( cd $(top_srcdir) && ./maint/gencvars )
endif MAINTAINER_MODE
......@@ -5,7 +5,7 @@
# features like tagging or anchors.
#
# It is used to generate cvar-handling code for MPICH.
# See the maint/genparams script for more information.
# See the maint/gencvars script for more information.
#
# The only tricky bit is that long reflowed text (such as a description)
# should use ">-" to both fold newlines and remove the trailing newline.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment