Add version flag to MANA commands

Author: fyshhh

Makefile.in

@@ -57,9 +57,9 @@ MANPAGES=dmtcp.1.gz dmtcp_coordinator.1.gz dmtcp_command.1.gz \
 # Version header.
 include Makefile.versions
 
-VERSION_HEADER := include/mana-version.h
-GITID_FILE     := .gitid
-GITID          := $(shell if [ -d ".git" ]; then git describe --always; fi)
+VERSION_HEADER    := contrib/mpi-proxy-split/mana-version.h
+GITID_FILE        := .gitid
+GITID             := $(shell if [ -d ".git" ]; then git describe --always; fi)
 
 # Git repository wasn't inited in MANA folder
 ifeq ($(GITID),)
@@ -313,8 +313,9 @@ clean: tidy
 	- cd contrib && $(MAKE) clean
 	- cd test && $(MAKE) clean
 	- cd manpages && ${MAKE} clean
-	- rm .gitid
-	- rm include/mana-version.h
+	- rm -f .gitid
+	- rm -f bin/.mana-version
+	- rm -f include/mana-version.h
 	- if test -z "$$DMTCP_TMPDIR"; then \
 	   if test -z "$$TMPDIR"; then \
 	     DMTCP_TMPDIR=/tmp/dmtcp-$$USER@`/bin/hostname`; \

README.md

@@ -47,7 +47,8 @@ In a later phase, this restriction will be lifted.
 As MANA is in constant development, it can be handy to keep track of its
 version, as well as identify what changes may have caused potential bugs. As of
 Jan 2022, version tracking has been implemented - simply refer to
-`include/mana-version.h` after building MANA.
+`include/mana-version.h` after building MANA, or use the `--version/-v` flag
+with any of the MANA commands.
 
 ** WARNING: ** MANA currently may have large runtime overhead or loss
 of accuracy on restart.  This is still under development.  Please test

contrib/mpi-proxy-split/Makefile

@@ -107,13 +107,14 @@ ${DMTCP_ROOT}/bin/mana_p2p_update_logs: ${WRAPPERS_SRCDIR}/mana_p2p_update_logs.
 #   which is a prerequisite for ${DMTCP_ROOT}/lib/dmtcp/libmana.so
 # Always do 'make default' or 'make install' -- not 'make libmana.so'
 # MANA_COORD_OBJS needed for 'make mana' at top level.
-install: ${MANA_COORD_OBJS}
+install: ${MANA_COORD_OBJS} ./mana-version.h
 	make -C ${WRAPPERS_SRCDIR} libmpiwrappers.a
 	make ${DMTCP_ROOT}/lib/dmtcp/libmana.so
 	make ${DMTCP_ROOT}/lib/dmtcp/libmpidummy.so
 	make ${DMTCP_ROOT}/bin/lh_proxy
 	make ${DMTCP_ROOT}/bin/gethostbyname_proxy
 	make ${DMTCP_ROOT}/bin/mana_p2p_update_logs
+	cp -f ./mana-version.h ${DMTCP_ROOT}/include
 
 tidy:
 	rm -f *~ .*.swp dmtcp_restart_script*.sh ckpt_*.dmtcp
@@ -123,6 +124,7 @@ clean: tidy
 	rm -f ${LIBOBJS} ${MANA_COORD_OBJS}
 	rm -f libmana.so
 	rm -f ${DMTCP_ROOT}/lib/dmtcp/libmana.so
+	rm -f ./mana-version.h ${DMTCP_ROOT}/include/mana-version.h
 	@cd ${LOWER_HALF_SRCDIR} && make clean
 	@cd ${WRAPPERS_SRCDIR} && make clean
 

contrib/mpi-proxy-split/mpi-wrappers/mpi_wrappers.cpp

@@ -36,6 +36,9 @@ DEFINE_FNC(int, Init_thread, (int *) argc, (char ***) argv,
            (int) required, (int *) provided)
 #else
 USER_DEFINED_WRAPPER(int, Init, (int *) argc, (char ***) argv) {
+
+  sleep(90);
+
   int retval;
   DMTCP_PLUGIN_DISABLE_CKPT();
   JUMP_TO_LOWER_HALF(lh_info.fsaddr);

src/mana_coordinator.sh

@@ -13,11 +13,14 @@ dir=`dirname $0`
 options=""
 verbose=0
 help=0
+version=0
 while [ -n "$1" ]; do
   if [ "$1" == --verbose ]; then
     verbose=1
   elif [ "$1" == --help ]; then
     help=1
+  elif [ "$1" == --version ]; then
+    version=1
   else
     options="$options $1"
   fi
@@ -29,6 +32,13 @@ if [ "$help" -eq 1 ]; then
   exit 0
 fi
 
+if [ "$version" -eq 1 ]; then
+  MANA_VERSION_FILE=$dir/../include/mana-version.h
+  MANA_VERSION=`awk '/MANA_VERSION / {print $4}' $MANA_VERSION_FILE`
+  echo "`basename $0` (MANA) ${MANA_VERSION}"
+  exit 0
+fi
+
 SITE=unknown
 if [ "$NERSC_HOST" = "cori" ]; then
   SITE=nersc

src/mana_launch.sh

@@ -31,11 +31,14 @@ options=""
 help=0
 verbose=0
 srun_sbatch_found=0
+version=0
 while [ -n "$1" ]; do
   if [ "$1" == --verbose ]; then
     verbose=1
   elif [ "$1" == --help ]; then
     help=1
+  elif [ "$1" == --version ]; then
+    version=1
   elif [ "$1" == srun ] || [ "$1" == sbatch ]; then
     srun_sbatch_found=1
   elif [ "$1" == --ckptdir ]; then
@@ -55,6 +58,13 @@ if [ "$help" -eq 1 ]; then
   exit 0
 fi
 
+if [ "$version" -eq 1 ]; then
+  MANA_VERSION_FILE=$dir/../include/mana-version.h
+  MANA_VERSION=`awk '/MANA_VERSION / {print $4}' $MANA_VERSION_FILE`
+  echo "`basename $0` (MANA) ${MANA_VERSION}"
+  exit 0
+fi
+
 SITE=unknown
 if [ "$NERSC_HOST" = "cori" ]; then
   SITE=nersc

src/mana_restart.sh

@@ -34,11 +34,14 @@ options=""
 restartdir=""
 verbose=0
 help=0
+version=0
 while [ -n "$1" ]; do
   if [ "$1" == --verbose ]; then
     verbose=1
   elif [ "$1" == --help ]; then
     help=1
+  elif [ "$1" == --version ]; then
+    version=1
   elif [ "$1" == --restartdir ]; then
     restartdir="$2"
     if [ ! -d "$restartdir" ]; then
@@ -57,6 +60,13 @@ if [ "$help" -eq 1 ]; then
   exit 0
 fi
 
+if [ "$version" -eq 1 ]; then
+  MANA_VERSION_FILE=$dir/../include/mana-version.h
+  MANA_VERSION=`awk '/MANA_VERSION / {print $4}' $MANA_VERSION_FILE`
+  echo "`basename $0` (MANA) ${MANA_VERSION}"
+  exit 0
+fi
+
 SITE=unknown
 if [ "$NERSC_HOST" = "cori" ]; then
   SITE=nersc

src/mana_status.sh

@@ -20,11 +20,14 @@ submissionPort=`grep Port: $HOME/.mana | sed -e 's%Port: %%'|sed -e 's% .*$%%'`
 options=""
 verbose=0
 help=0
+version=0
 while [ -n "$1" ]; do
   if [ "$1" == --verbose ]; then
     verbose=1
   elif [ "$1" == --help ]; then
     help=1
+  elif [ "$1" == --version ]; then
+    version=1
   else
     options="$options $1"
   fi
@@ -36,6 +39,13 @@ if [ "$help" -eq 1 ]; then
   exit 0
 fi
 
+if [ "$version" -eq 1 ]; then
+  MANA_VERSION_FILE=$dir/../include/mana-version.h
+  MANA_VERSION=`awk '/MANA_VERSION / {print $4}' $MANA_VERSION_FILE`
+  echo "`basename $0` (MANA) ${MANA_VERSION}"
+  exit 0
+fi
+
 coordinator_found=0
 $dir/dmtcp_command -s -h $submissionHost -p $submissionPort 1>/dev/null \
                    && coordinator_found=1