Moved version bump back to 2.4.1.

also added QUIET as an alias of ALWAYS in parsing debug levels, since the older docs mention it.
ovis-hpc · Apr 27, 2015 · 104b782 · 104b782
1 parent a237194
commit 104b782
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 22 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT(ldms-all, 2.5.0, [email protected])
+AC_INIT(ldms-all, 2.4.1, [email protected])
 #fixme=--subdir
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([m4/Ovis-top.m4])

diff --git a/ldms/configure.ac b/ldms/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT(ovis-ldms, 2.5.0, [email protected])
+AC_INIT(ovis-ldms, 2.4.1, [email protected])
 AC_CONFIG_MACRO_DIR([m4])
 dnl AC_CONFIG_SRCDIR([src/ldms.h])
 AC_CONFIG_AUX_DIR(config)

diff --git a/ldms/scripts/ldms_local_procstatutil.sh.in b/ldms/scripts/ldms_local_procstatutil.sh.in
@@ -32,12 +32,19 @@ case "x$USER" in
 	exit 1
 	;;
 esac
+function mysleep() {
+	echo -n sleep $1 ... 
+	sleep $1
+	echo done
+}
 
 # use our pid in dirname to prevent collisions in dir & file naming
 TESTDIR=/tmp/$USER/ldmstest/$$
 STOREDIR=$TESTDIR/store
 SOCKDIR=$TESTDIR/run/ldmsd
 LOGDIR=$TESTDIR/logs
+#export TSAN_OPTIONS=verbosity=1:log_path=$LOGDIR:strip_path_prefix=$prefix
+#export ASAN_OPTIONS=verbosity=1:log_path=$LOGDIR:detect_stack_use_after_return=1:detect_leaks=1:strip_path_prefix=$prefix
 export LDMSD_SOCKPATH=${TESTDIR}/run
 mkdir -p $STOREDIR $SOCKDIR $LOGDIR $LDMSD_SOCKPATH
 echo "logs and data stored under $TESTDIR"
@@ -49,7 +56,7 @@ export LDMSD_PLUGIN_LIBPATH=@pkglibdir@
 
 # whack the daemons we own
 pkill ldmsd
-sleep 1
+mysleep 1
 echo "Listing ldmsd's still running:"
 pgrep ldmsd
 echo "Done."
@@ -67,44 +74,44 @@ echo Starting daemons
 ldmsd -x sock:$port1 -S $SOCKDIR/metric_socket_1  -l ${LOGDIR}/1.txt -q DEBUG
 ldmsd -x sock:$port2 -S $SOCKDIR/metric_socket_2  -l ${LOGDIR}/2.txt -q DEBUG
 ldmsd -x sock:$port3 -S $SOCKDIR/metric_socket_3  -l ${LOGDIR}/3.txt -q DEBUG
-sleep 1
+mysleep 1
 
 
 echo Starting plugins on daemon1
 echo "load name=procstatutil" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_1
 echo "config name=procstatutil set=localhost1/procstatutil component_id=1" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_1
 echo "start name=procstatutil interval=1000000" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_1
-sleep 1
+mysleep 1
 
 echo Starting plugins on daemon2
 echo "load name=procstatutil2" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_2
 echo "config name=procstatutil2 set=localhost2/procstatutil2 maxcpu=8 metrics_type=1 component_id=2" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_2
 echo "start name=procstatutil2 interval=1000000" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_2
-sleep 2
+mysleep 2
 
 echo Adding host2 to aggregator3
 echo "add host=localhost type=active xprt=sock interval=1000000 port=$port2 sets=localhost2/procstatutil2" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
-sleep 1
+mysleep 1
 echo Adding host1 to aggregator3
 echo "add host=localhost type=active xprt=sock interval=1000000 port=$port1 sets=localhost1/procstatutil" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
 
-sleep 5
+mysleep 5
 echo Adding store_csv to aggregator3
 echo "load name=store_csv" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
-sleep 2
+mysleep 2
 echo "config name=store_csv path=${STOREDIR} altheader=1 id_pos=1" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
 echo "store name=store_csv comp_type=node set=procstatutil container=procstatutil" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
 echo "store name=store_csv comp_type=node set=procstatutil2 container=procstatutil2" | ${BUILDDIR}/sbin/ldmsctl -S $SOCKDIR/metric_socket_3
-sleep 2
+mysleep 2
 #
 
-sleep 5
+mysleep 5
 echo ldms_ls on host 1:
 ldms_ls -h localhost -x sock -p $port1 -l
-sleep 1
+mysleep 1
 echo ldms_ls on host 2:
 ldms_ls -h localhost -x sock -p $port2 -l
-sleep 1
+mysleep 1
 echo ldms_ls on host 3:
 ldms_ls -h localhost -x sock -p $port3 
 

diff --git a/ldms/src/core/ldms.c b/ldms/src/core/ldms.c
@@ -106,6 +106,9 @@ int ldms_str_to_level(const char *level_s)
 			return i;
 		}
 	}
+	if (strcmp(level_s,"QUIET") == 0) {
+		return LDMS_LALWAYS; /* old usage support */
+	}
 
 	return -1;
 }

diff --git a/ldms/src/core/ldms.h b/ldms/src/core/ldms.h
@@ -486,6 +486,7 @@ static inline ldms_metric_t *ldms_mvec_get_metrics(ldms_mvec_t mvec)
 #define LDMS_STR_WRAP(NAME) #NAME,
 #define LDMS_LWRAP(NAME) LDMS_L ## NAME,
 
+/* a command line alias of always is QUIET for back compatibility. */
 #define LOGLEVELS(WRAP) \
 	WRAP (DEBUG) \
 	WRAP (INFO) \

diff --git a/lib/configure.ac b/lib/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT([ovis-lib], 2.5.0, [email protected])
+AC_INIT([ovis-lib], 2.4.1, [email protected])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)

diff --git a/packaging/firerpms b/packaging/firerpms
@@ -3,7 +3,7 @@
 ./configure '--enable-ssl' '--enable-rdma' '--enable-ncsa-unified' '--disable-zap' '--disable-zaptest' '--with-libevent=/usr/lib64/ovis-libevent2' '--disable-rpath' '--enable-authentication' '--disable-readline' '--enable-sysclassib' 'CC=gcc46' 'CXX=g++' --disable-sos 
 ./util/release_tarball-240.sh
 cd Release
-tar zxf ldms-2.5.0.tar.gz
-cd ldms-2.5.0
+tar zxf ldms-2.4.1.tar.gz
+cd ldms-2.4.1
 ./configure '--enable-ssl' '--enable-rdma' '--enable-ncsa-unified' '--disable-zap' '--disable-zaptest' '--with-libevent=/usr/lib64/ovis-libevent2' '--disable-rpath' '--enable-authentication' '--disable-readline' '--enable-sysclassib' 'CC=gcc46' 'CXX=g++' --disable-sos 
 make toss
diff --git a/packaging/ovis-base.spec.in b/packaging/ovis-base.spec.in
@@ -93,7 +93,7 @@ Doxygen files for ldms-all package.
 %{_datadir}/doc/%{name}-%{version}
 %docdir %{_defaultdocdir}
 %changelog
-* Thu Apr 23 2015 Ben Allan <[email protected]> 2.5.0-1
+* Thu Apr 23 2015 Ben Allan <[email protected]> 2.4.1-1
 packaging with sysclassib and procstatutil2 enabled.
 * Wed Feb 18 2015 Ben Allan <[email protected]> 2.4.0-1
 packaging with separate libevent

diff --git a/util/man/Plugin_procstatutil.man b/util/man/Plugin_procstatutil.man
@@ -1,6 +1,6 @@
 .\" Manpage for Plugin_procstatutil
 .\" Contact [email protected] to correct errors or typos.
-.TH man 7 "11 Apr 2015" "v2.5.0" "Deprecated LDMS Plugin procstatutil man page"
+.TH man 7 "11 Apr 2015" "v2.4.1" "Deprecated LDMS Plugin procstatutil man page"
 
 .SH NAME
 Plugin_procstatutil - man page for the LDMS deprecated procstatutil plugin

diff --git a/util/man/Plugin_store_csv.man b/util/man/Plugin_store_csv.man
@@ -1,6 +1,6 @@
 .\" Manpage for Plugin_store_csv
 .\" Contact [email protected] to correct errors or typos.
-.TH man 7 "13 Apr 2015" "v2.5.0" "LDMS Plugin store_csv man page"
+.TH man 7 "13 Apr 2015" "v2.4.1" "LDMS Plugin store_csv man page"
 
 .SH NAME
 Plugin_store_csv - man page for the LDMS store_csv plugin

diff --git a/util/man/ldmsd.man b/util/man/ldmsd.man
@@ -1,6 +1,6 @@
 .\" Manpage for ldmsd
 .\" Contact [email protected] to correct errors or typos.
-.TH man 8 "13 Apr 2015" "v2.5.0" "ldmsd man page"
+.TH man 8 "13 Apr 2015" "v2.4.0" "ldmsd man page"
 
 .SH NAME
 ldmsd \- Start an ldms daemon

diff --git a/util/release_tarball-240.sh b/util/release_tarball-240.sh
@@ -6,9 +6,9 @@ if ! test -f m4/Ovis-top.m4; then
 fi
 REPO_DIR=`pwd`
 OUTPUT_DIR=`pwd`/Release
-BRANCH_NAME=v.2.5.0
+BRANCH_NAME=v.2.4.1
 # Will get this from git in the future
-VERSION=2.5.0
+VERSION=2.4.1
 
 if ! test -f libevent-2.0.21-stable.tar.gz; then
 	echo "do not need a copy of libevent-2.0.21-stable.tar.gz in $REPO_DIR"