Hpe to upstream

.gitignore

@@ -30,6 +30,7 @@ config/ltmain.sh
 config/ltoptions.m4
 config/ltversion.m4
 config/lt~obsolete.m4
+config/compile
 config/config.guess
 config/config.sub
 config/depcomp
@@ -88,6 +89,7 @@ src/to_wrap.C
 src/tomod.py
 src/dysect/DysectAPI/.deps/
 src/dysect/DysectAPI/.libs/
+src/dysect/DysectAPI/Aggregates/.deps/
 src/dysect/libDysectAPI/src/.deps/
 src/dysect/libDysectAPI/src/.libs/
 src/dysect/libDysectAPI/src/expr-parser.cc

config/x_ac_arch.m4

@@ -8,4 +8,12 @@ AC_DEFUN([X_AC_ARCH], [
     [CXXFLAGS="$CXXFLAGS"]
     AM_CONDITIONAL([ENABLE_BGL], true)
   )  
+
+AC_ARG_WITH(cray-xt,
+    [AS_HELP_STRING([--with-cray-xt],
+        [Add the flags to run on a Cray XT system]
+    )],
+    [AC_DEFINE([CRAYXT], [], [Compilation for CrayXT systems])]
+    [CXXFLAGS="$CXXFLAGS"]
+    )
 ])

config/x_ac_boost.m4

@@ -21,13 +21,13 @@ AC_DEFUN([X_AC_BOOST], [
       else
         AC_SUBST(LIBBOOSTDIR, [$with_boost_path/lib])
       fi
-      AC_SUBST(LIBBOOST,["-lboost_date_time -lboost_thread -lboost_filesystem -lboost_program_options -lboost_regex -lboost_system -lboost_system -lboost_wave"])
+      AC_SUBST(LIBBOOST,["-lboost_thread"])
       AC_DEFINE(HAVE_BOOST_TO,1,[Define 1 if a compatible boost package is found])	
       boost_found="yes"
     elif test -f "$with_boost_path"/include/boost-1_37/boost/algorithm/string.hpp ; then 
       AC_SUBST(BOOST_INCLUDE, -I$with_boost_path/include/boost-1_37)
       AC_SUBST(LIBBOOSTDIR, [$with_boost_path/lib])
-      AC_SUBST(LIBBOOST,["-lboost_date_time -lboost_thread -lboost_filesystem -lboost_program_options -lboost_regex -lboost_system -lboost_system -lboost_wave"])
+      AC_SUBST(LIBBOOST,["-lboost_date_time -lboost_thread -lboost_filesystem"])
       AC_DEFINE(HAVE_BOOST_TO,1,[Define 1 if a compatible boost package is found])	
       boost_found="yes $LIBBOOSTDIR"
     else
@@ -43,7 +43,7 @@ AC_DEFUN([X_AC_BOOST], [
       else
         AC_SUBST(LIBBOOSTDIR, [$boost_dflt_dir/lib])
       fi
-      AC_SUBST(LIBBOOST,["-lboost_date_time -lboost_thread -lboost_filesystem -lboost_program_options -lboost_regex -lboost_system -lboost_system -lboost_wave"])
+      AC_SUBST(LIBBOOST,["-lboost_date_time -lboost_thread -lboost_filesystem"])
       boost_found="yes $LIBBOOSTDIR"
     else
       boost_found="no"

config/x_ac_mrnet.m4

@@ -13,6 +13,16 @@ AC_DEFUN([X_AC_MRNET], [
       MRNETPREFIX=""
     ]
   )
+  AC_ARG_WITH(extra-mrnet-rpath,
+    [AS_HELP_STRING([--with-extra-mrnet-rpath=path],
+      [Add additional rpath fro mrnet]
+    )],
+    [RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath=${withval}"],
+    []
+  )
+  AC_MSG_CHECKING([setting the RPATH_FLAGS for mrnet])
+  AC_MSG_RESULT([$RPATH_FLAGS])
+
   mrn_incs=`ls -d $MRNETPREFIX/lib/*/include` 
   for mrn_inc in $mrn_incs
   do
@@ -66,7 +76,7 @@ AC_DEFUN([X_AC_MRNET], [
     AC_MSG_ERROR([libmrnet is required.  Specify libmrnet prefix with --with-mrnet])
   fi
   AC_LANG_POP(C++)
-  AC_PATH_PROG([MRNETCOMMNODEBIN], [mrnet_commnode], [no], [$MRNETPREFIX/bin$PATH_SEPARATOR$PATH])
+  AC_PATH_PROG([MRNETCOMMNODEBIN], [mrnet_commnode], [no], [$MRNETPREFIX/bin$PATH_SEPARATOR$MRNETPREFIX/libexec$PATH_SEPARATOR$PATH])
   if test $MRNETCOMMNODEBIN = no; then
     AC_MSG_ERROR([the mrnet_commnode executable is required.  Specify mrnet prefix with --with-mrnet])
   fi

config/x_ac_python.m4

@@ -38,17 +38,13 @@ AC_DEFUN([X_AC_PYTHON], [
   AC_MSG_CHECKING([Python version])
   python_version=`$PYTHON -c "import distutils.sysconfig; \
     print(distutils.sysconfig.get_python_version());"`
-  python_minor_version=`echo $python_version | sed 's/.*\.\(.*\)/\1/'`
-  if test $python_version '>' 2.99 ; then
-    if test $python_minor_version -lt 8 ; then
-      m="m"
-      python_version=$python_version$m
-    else
-      python_version=$python_version
-    fi  
-  else
+  if test $python_version '<' 3.0 ; then
     AM_CONDITIONAL([ENABLE_PYTHON2], true)
   fi
+  if test $python_version '<' 3.9 ; then
+    m="m"
+    python_version=$python_version$m
+  fi 
   AC_MSG_RESULT($python_version)
-  AM_COND_IF([ENABLE_GDB], [BELIBS="-lpython$python_version $BELIBS"], [])
+  BELIBS="-lpython$python_version $BELIBS"
 ])

configure.ac

@@ -27,16 +27,15 @@ X_AC_TEMPORALORDERINGAPI
 X_AC_PYTHON
 AM_PATH_PYTHON
 X_AC_GUI
-X_AC_BOOST
 X_AC_ARCH
+X_AC_BOOST
 X_AC_DEBUGLIBS
 X_AC_GRAPHLIB
-X_AC_LAUNCHMON
-X_AC_RM_COMM
 X_AC_MRNET
 X_AC_FGFS
 X_AC_CALLPATH
 
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h stdlib.h sys/time.h unistd.h])
@@ -68,6 +67,7 @@ AC_ARG_ENABLE(statbench,
 
 AM_CONDITIONAL([ENABLE_STATBENCH], [test "$WITH_STATBENCH" = yes])
 
+
 AC_ARG_WITH(procspernode,
   [AS_HELP_STRING([--with-procspernode=num],[Set the maximum number of communication processes per node equal to num, defaults to 1 if not specified])],
   [AC_DEFINE_UNQUOTED([STAT_PROCS_PER_NODE], [$withval], [The max number of CPs per node])],
@@ -80,6 +80,34 @@ AC_ARG_WITH(usagelog,
   [CXXFLAGS="$CXXFLAGS"]
 )
 
+AM_CONDITIONAL([WITH_CTI], false)
+
+AC_ARG_WITH(cti,
+	[AS_HELP_STRING([--with-cti],
+		[Location of the common tools interface package]
+		)
+	],
+	[CXXFLAGS="$CXXFLAGS -I${withval}/include"
+	  LDFLAGS="$LDFLAGS -L${withval}/lib"
+	  AM_CONDITIONAL([WITH_CTI], true)
+	  AC_DEFINE([USE_CTI], [], [Use CTI for ALPS and PALS support])
+	  WITH_CTI=yes
+	],	
+	[CXXFLAGS="$CXXFLAGS"
+	 WITH_CTI=no]
+)
+
+
+if test "$WITH_CTI" = "yes"
+then
+  PKG_PROG_PKG_CONFIG
+  PKG_CHECK_MODULES([CRAY_CTI_FE],[common_tools_fe],[],[AC_MSG_ERROR([libcommontools_fe.so not found.])])
+  PKG_CHECK_MODULES([CRAY_CTI_BE],[common_tools_be],[],[AC_MSG_ERROR([libcommontools_be.so not found.])])
+else
+  X_AC_LAUNCHMON
+  X_AC_RM_COMM
+fi
+
 AC_ARG_WITH(alias-suffix,
   [AS_HELP_STRING([--with-alias-suffix=suffix],[drop suffix from the hostname alias])],
   [CXXFLAGS="$CXXFLAGS -DSTAT_ALIAS_SUFFIX=\\\"${withval}\\\""],
@@ -114,9 +142,6 @@ AC_SUBST(BELIBS)
 AC_SUBST(MWLIBS)
 AC_SUBST(MRNETCOMMNODEBIN)
 AC_SUBST(DOTBINDIR)
-AC_SUBST(LAUNCHMONBIN)
-AC_SUBST(NEWLAUNCHMONBIN)
-AC_SUBST(LAUNCHMONPREFIX)
 AC_SUBST(GRAPHLIBPREFIX)
 AC_SUBST(STACKWALKERPREFIX)
 AC_SUBST(DEPCOREPREFIX)

scripts/STAT.in

@@ -82,5 +82,14 @@ if test -n "$PYTHONPATH" ; then
 else
     export PYTHONPATH=@pythondir@:@pyexecdir@:@PYTHONPATH@
 fi
+if test -n "$STAT_INSTALL_DIR"; then
+     if test -z "$STAT_DAEMON_PATH" ; then
+	export STAT_DAEMON_PATH=$prefix/bin/STATD
+    fi
+    if test -z "$STAT_FILTER_PATH" ; then
+	export STAT_FILTER_PATH=$prefix/lib/STAT_FilterDefinitions.so
+    fi
+    export PATH=$PATH:$prefix/bin
+fi    
 
 exec @STATPYTHON@ @pythondir@/STATmain.py $@

scripts/STATGUI.in

@@ -73,13 +73,21 @@ fi
 if test -z "$LMON_FE_ENGINE_TIMEOUT" ; then
     export LMON_FE_ENGINE_TIMEOUT=600
 fi
-
 export PATH=$PATH:@DOTBINDIR@
 if test -n "$PYTHONPATH" ; then
     export PYTHONPATH=@pythondir@:@pyexecdir@:@PYTHONPATH@:$PYTHONPATH
 else
     export PYTHONPATH=@pythondir@:@pyexecdir@:@PYTHONPATH@
 fi
+if test -n "$STAT_INSTALL_DIR"; then
+    if test -z "$STAT_DAEMON_PATH" ; then
+	export STAT_DAEMON_PATH=$prefix/bin/STATD
+    fi
+    if test -z "$STAT_FILTER_PATH" ; then
+	export STAT_FILTER_PATH=$prefix/lib/STAT_FilterDefinitions.so
+    fi
+    export PATH=$PATH:$prefix/bin
+fi    
 
 if test -n @GSETTINGS_SCHEMA_DIR@ ; then
     export GSETTINGS_SCHEMA_DIR=@GSETTINGS_SCHEMA_DIR@

scripts/stat-cl.in

@@ -80,4 +80,14 @@ if test -n "$PYTHONPATH" ; then
 else
     export PYTHONPATH=@pythondir@:@pyexecdir@:@PYTHONPATH@
 fi
+if test -n "$STAT_INSTALL_DIR"; then
+    if test -z "$STAT_DAEMON_PATH" ; then
+	export STAT_DAEMON_PATH=$prefix/bin/STATD
+    fi
+    if test -z "$STAT_FILTER_PATH" ; then
+	export STAT_FILTER_PATH=$prefix/lib/STAT_FilterDefinitions.so
+    fi
+    export PATH=$PATH:$prefix/bin
+fi    
+
 exec @STATPYTHON@ @pythondir@/STATmain.py cl $@

scripts/xdot.py

@@ -1507,6 +1507,8 @@ def __init__(self):
         self.drag_action = NullAction(self)
         self.presstime = None
         self.highlight = None
+        self.pressx = None
+        self.pressy = None
 
     def set_filter(self, filter):
         self.filter = filter

src/Makefile.am

@@ -45,10 +45,16 @@ STATD_SOURCES = STATD.C STAT.h STAT_BackEnd.h STAT_GraphRoutines.h
 STATbin_LDADD = libstatfe.la @FELIBS@
 STATD_LDADD = libstatbe.la @BELIBS@
 
-
-stat_be_la_sources_base = STAT_BackEnd.C STAT_BackEnd.h STAT_lmonBackEnd.C STAT_lmonBackEnd.h STAT.h STAT_timer.h STAT_timer.C STAT_CircularLogs.C
-stat_fe_la_sources_base = STAT_FrontEnd.C STAT_lmonFrontEnd.C STAT_FrontEnd.h  STAT_lmonFrontEnd.h STAT.h STAT_timer.h STAT_timer.C
-
+stat_be_la_sources_base = STAT_BackEnd.C STAT_BackEnd.h STAT.h STAT_timer.h STAT_timer.C STAT_CircularLogs.C
+stat_fe_la_sources_base = STAT_FrontEnd.C STAT_FrontEnd.h STAT.h STAT_timer.h STAT_timer.C
+
+if WITH_CTI
+stat_be_la_sources_base += STAT_ctiBackEnd.C STAT_ctiBackEnd.h
+stat_fe_la_sources_base += STAT_ctiFrontEnd.h STAT_ctiFrontEnd.C
+else
+stat_be_la_sources_base += STAT_lmonBackEnd.C STAT_lmonBackEnd.h
+stat_fe_la_sources_base += STAT_lmonFrontEnd.h STAT_lmonFrontEnd.C
+endif
 
 libstatbe_la_SOURCES = $(stat_be_la_sources_base) $(stat_graphlib_sources) $(stat_be_la_sources_fgfs)
 libstatfe_la_SOURCES = $(stat_fe_la_sources_base) $(stat_graphlib_sources) 

src/STAT.h

@@ -119,6 +119,7 @@ typedef enum {
     STAT_TERMINATE_ERROR,
     STAT_FILE_ERROR,
     STAT_LMON_ERROR,
+    STAT_CTI_ERROR,	
     STAT_ARG_ERROR,
     STAT_VERSION_ERROR,
     STAT_NOT_LAUNCHED_ERROR,
@@ -192,6 +193,9 @@ typedef enum {
         case STAT_LMON_ERROR: \
             fprintf(outFp, "STAT_LMON_ERROR"); \
             break; \
+        case STAT_CTI_ERROR: \
+            fprintf(outFp, "STAT_CTI_ERROR"); \
+            break; \
         case STAT_ARG_ERROR: \
             fprintf(outFp, "STAT_ARG_ERROR"); \
             break; \

src/STAT.i

@@ -142,6 +142,7 @@ typedef enum {
                STAT_TERMINATE_ERROR,
                STAT_FILE_ERROR,
                STAT_LMON_ERROR,
+               STAT_CTI_ERROR,
                STAT_ARG_ERROR,
                STAT_VERSION_ERROR,
                STAT_NOT_LAUNCHED_ERROR,

src/STATBenchD.C

@@ -36,8 +36,12 @@ int main(int argc, char **argv)
     char logOutDir[BUFSIZE];
     STAT_BackEnd *statBackEnd;
     StatError_t statError;
+#ifdef USE_CTI	
+    StatDaemonLaunch_t launchType = STATD_CTI_LAUNCH;
+#else	
     StatDaemonLaunch_t launchType = STATD_LMON_LAUNCH;
-
+#endif
+
     struct option longOptions[] =
     {
         {"mrnetprintf",         no_argument,        0, 'm'},

src/STATD.C

@@ -35,7 +35,11 @@ int main(int argc, char **argv)
     char logOutDir[BUFSIZE];
     string invocationString;
     vector<string> serialProcesses;
+#ifdef USE_CTI	
+    StatDaemonLaunch_t launchType = STATD_CTI_LAUNCH;
+#else
     StatDaemonLaunch_t launchType = STATD_LMON_LAUNCH;
+#endif	
     StatError_t statError;
     STAT_BackEnd *statBackEnd;