From 29415ffea05122ea8cec45378e07631d2c529d90 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Tue, 6 Jun 2006 19:23:26 +0000
Subject: [PATCH] svn merge -r8289:8319
https://eris/svn/slurm/branches/slurm-1.1
---
Makefile.in | 5 +-
NEWS | 5 +
aclocal.m4 | 1 +
auxdir/Makefile.in | 3 +
auxdir/x_ac_sgi_job.m4 | 21 +
configure | 99 +++-
configure.ac | 5 +
doc/Makefile.in | 3 +
doc/html/Makefile.in | 3 +
doc/html/configurator.html | 5 +-
doc/html/proctrack_plugins.shtml | 11 +-
doc/man/Makefile.in | 3 +
doc/man/man5/slurm.conf.5 | 31 +-
etc/slurm.conf.example | 9 +-
src/Makefile.in | 3 +
src/api/Makefile.in | 3 +
src/api/signal.c | 21 +-
src/common/Makefile.in | 3 +
src/plugins/Makefile.in | 3 +
src/plugins/auth/Makefile.in | 3 +
src/plugins/auth/authd/Makefile.in | 3 +
src/plugins/auth/munge/Makefile.in | 3 +
src/plugins/auth/none/Makefile.in | 3 +
src/plugins/checkpoint/Makefile.in | 3 +
src/plugins/checkpoint/aix/Makefile.in | 3 +
src/plugins/checkpoint/none/Makefile.in | 3 +
src/plugins/jobacct/Makefile.in | 3 +
src/plugins/jobacct/aix/Makefile.in | 3 +
src/plugins/jobacct/linux/Makefile.in | 3 +
src/plugins/jobacct/none/Makefile.in | 3 +
src/plugins/jobcomp/Makefile.in | 3 +
src/plugins/jobcomp/filetxt/Makefile.in | 3 +
src/plugins/jobcomp/none/Makefile.in | 3 +
src/plugins/jobcomp/script/Makefile.in | 3 +
src/plugins/mpi/Makefile.in | 3 +
src/plugins/mpi/lam/Makefile.in | 3 +
src/plugins/mpi/mpichgm/Makefile.in | 3 +
src/plugins/mpi/mvapich/Makefile.in | 3 +
src/plugins/mpi/none/Makefile.in | 3 +
src/plugins/proctrack/Makefile.am | 10 +-
src/plugins/proctrack/Makefile.in | 10 +-
src/plugins/proctrack/aix/Makefile.in | 3 +
src/plugins/proctrack/linuxproc/Makefile.in | 3 +
src/plugins/proctrack/pgid/Makefile.in | 3 +
src/plugins/proctrack/rms/Makefile.in | 3 +
src/plugins/proctrack/sgi_job/Makefile.am | 15 +
src/plugins/proctrack/sgi_job/Makefile.in | 553 ++++++++++++++++++
.../proctrack/sgi_job/proctrack_sgi_job.c | 223 +++++++
src/plugins/sched/Makefile.in | 3 +
src/plugins/sched/backfill/Makefile.in | 3 +
src/plugins/sched/builtin/Makefile.in | 3 +
src/plugins/sched/hold/Makefile.in | 3 +
src/plugins/sched/maui/Makefile.in | 3 +
src/plugins/sched/maui/wiki/Makefile.in | 3 +
src/plugins/select/Makefile.in | 3 +
src/plugins/select/bluegene/Makefile.in | 3 +
.../bluegene/block_allocator/Makefile.in | 3 +
.../select/bluegene/plugin/Makefile.in | 3 +
src/plugins/select/cons_res/Makefile.in | 3 +
src/plugins/select/linear/Makefile.in | 3 +
src/plugins/switch/Makefile.in | 3 +
src/plugins/switch/elan/Makefile.in | 3 +
src/plugins/switch/federation/Makefile.in | 3 +
src/plugins/switch/none/Makefile.in | 3 +
src/plugins/task/Makefile.in | 3 +
src/plugins/task/affinity/Makefile.in | 3 +
src/plugins/task/none/Makefile.in | 3 +
src/sacct/Makefile.in | 3 +
src/sbcast/Makefile.in | 3 +
src/scancel/Makefile.in | 3 +
src/scontrol/Makefile.in | 3 +
src/sinfo/Makefile.in | 3 +
src/slurmctld/Makefile.in | 3 +
src/slurmctld/job_mgr.c | 4 +-
src/slurmd/Makefile.in | 3 +
src/slurmd/common/proctrack.h | 7 +-
src/slurmd/slurmd/Makefile.in | 3 +
src/slurmd/slurmstepd/Makefile.in | 3 +
src/smap/Makefile.in | 3 +
src/squeue/Makefile.in | 3 +
src/srun/Makefile.in | 3 +
testsuite/Makefile.in | 3 +
testsuite/expect/Makefile.in | 41 +-
testsuite/slurm_unit/Makefile.in | 3 +
testsuite/slurm_unit/api/Makefile.in | 3 +
testsuite/slurm_unit/api/manual/Makefile.in | 3 +
testsuite/slurm_unit/common/Makefile.in | 3 +
testsuite/slurm_unit/slurmctld/Makefile.in | 3 +
testsuite/slurm_unit/slurmd/Makefile.in | 3 +
89 files changed, 1231 insertions(+), 55 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 4a9434fb792..656a0182d42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am 8073 2006-05-15 18:53:33Z jette $
+# $Id: Makefile.am 8278 2006-06-02 00:23:24Z jette $
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -155,6 +156,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/NEWS b/NEWS
index aa981a445d1..e469ce3ba83 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ documents those changes that are of interest to users and admins.
-- Send overcommit flag from srun in RPCs and have slurmd set SLURM_OVERCOMMIT
flag at batch job launch time.
+* Changes in SLURM 1.1.2
+========================
+ -- Fix bug in jobcomp/filetxt plugin to report proper NodeCnt when a job
+ fails due to a node failure.
+
* Changes in SLURM 1.1.1
========================
-- Fix bug in packing job suspend/resume RPC.
diff --git a/aclocal.m4 b/aclocal.m4
index e002c3483db..56889bef8e7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7026,5 +7026,6 @@ m4_include([auxdir/x_ac_pam.m4])
m4_include([auxdir/x_ac_ptrace.m4])
m4_include([auxdir/x_ac_readline.m4])
m4_include([auxdir/x_ac_setproctitle.m4])
+m4_include([auxdir/x_ac_sgi_job.m4])
m4_include([auxdir/x_ac_slurm_ssl.m4])
m4_include([auxdir/x_ac_xcpu.m4])
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 675a237c5ab..ac4e403b00d 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -119,6 +120,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/auxdir/x_ac_sgi_job.m4 b/auxdir/x_ac_sgi_job.m4
index e69de29bb2d..6eb29bb2061 100644
--- a/auxdir/x_ac_sgi_job.m4
+++ b/auxdir/x_ac_sgi_job.m4
@@ -0,0 +1,21 @@
+##*****************************************************************************
+## $Id: x_ac_aix.m4 8192 2006-05-25 00:15:05Z morrone $
+##*****************************************************************************
+# AUTHOR:
+# Mark Grondona <mgrondona@llnl.gov>
+#
+# SYNOPSIS:
+# AC_SGI_JOB
+#
+# DESCRIPTION:
+# Check for presence of SGI job container support via libjob.so
+##*****************************************************************************
+
+
+AC_DEFUN([X_AC_SGI_JOB],
+[
+ AC_CHECK_LIB([job], [job_attachpid], [ac_have_sgi_job="yes"], [])
+ AC_MSG_CHECKING([for SGI job container support])
+ AC_MSG_RESULT([${ac_have_sgi_job=no}])
+ AM_CONDITIONAL(HAVE_SGI_JOB, test "x$ac_have_sgi_job" = "xyes")
+])
diff --git a/configure b/configure
index 220b9b571c4..6c9045436ea 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PROJECT SLURM_API_VERSION SLURM_API_CURRENT SLURM_API_MAJOR SLURM_API_AGE SLURM_API_REVISION VERSION SLURM_MAJOR SLURM_MINOR SLURM_MICRO RELEASE SLURM_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CMD_LDFLAGS LIB_LDFLAGS SO_LDFLAGS HAVE_AIX_TRUE HAVE_AIX_FALSE HAVE_AIX PROCTRACKDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_AIX_PROCTRACK_TRUE HAVE_AIX_PROCTRACK_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_GNU_LD_TRUE WITH_GNU_LD_FALSE HAVE_SCHED_SETAFFINITY_TRUE HAVE_SCHED_SETAFFINITY_FALSE NUMA_LIBS HAVE_NUMA_TRUE HAVE_NUMA_FALSE PAM_LIBS HAVE_PAM_TRUE HAVE_PAM_FALSE LIBOBJS HAVE_UNSETENV_TRUE HAVE_UNSETENV_FALSE PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BG_INCLUDES BG_LDFLAGS SEMAPHORE_SOURCES SEMAPHORE_LIBS NCURSES HAVE_SOME_CURSES_TRUE HAVE_SOME_CURSES_FALSE HAVE_SOME_CURSES DEBUG_MODULES_TRUE DEBUG_MODULES_FALSE SLURMCTLD_PORT SLURMD_PORT ELAN_LIBS HAVE_ELAN_TRUE HAVE_ELAN_FALSE HAVE_ELAN FEDERATION_LDFLAGS HAVE_FEDERATION_TRUE HAVE_FEDERATION_FALSE HAVE_FEDERATION READLINE_LIBS SSL_LDFLAGS SSL_LIBS SSL_CPPFLAGS MUNGE_LIBS MUNGE_CPPFLAGS MUNGE_LDFLAGS WITH_MUNGE_TRUE WITH_MUNGE_FALSE AUTHD_LIBS AUTHD_CFLAGS WITH_AUTHD_TRUE WITH_AUTHD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PROJECT SLURM_API_VERSION SLURM_API_CURRENT SLURM_API_MAJOR SLURM_API_AGE SLURM_API_REVISION VERSION SLURM_MAJOR SLURM_MINOR SLURM_MICRO RELEASE SLURM_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CMD_LDFLAGS LIB_LDFLAGS SO_LDFLAGS HAVE_AIX_TRUE HAVE_AIX_FALSE HAVE_AIX PROCTRACKDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HAVE_AIX_PROCTRACK_TRUE HAVE_AIX_PROCTRACK_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_GNU_LD_TRUE WITH_GNU_LD_FALSE HAVE_SCHED_SETAFFINITY_TRUE HAVE_SCHED_SETAFFINITY_FALSE NUMA_LIBS HAVE_NUMA_TRUE HAVE_NUMA_FALSE PAM_LIBS HAVE_PAM_TRUE HAVE_PAM_FALSE LIBOBJS HAVE_UNSETENV_TRUE HAVE_UNSETENV_FALSE PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS BG_INCLUDES BG_LDFLAGS SEMAPHORE_SOURCES SEMAPHORE_LIBS NCURSES HAVE_SOME_CURSES_TRUE HAVE_SOME_CURSES_FALSE HAVE_SOME_CURSES DEBUG_MODULES_TRUE DEBUG_MODULES_FALSE SLURMCTLD_PORT SLURMD_PORT ELAN_LIBS HAVE_ELAN_TRUE HAVE_ELAN_FALSE HAVE_ELAN FEDERATION_LDFLAGS HAVE_FEDERATION_TRUE HAVE_FEDERATION_FALSE HAVE_FEDERATION HAVE_SGI_JOB_TRUE HAVE_SGI_JOB_FALSE READLINE_LIBS SSL_LDFLAGS SSL_LIBS SSL_CPPFLAGS MUNGE_LIBS MUNGE_CPPFLAGS MUNGE_LDFLAGS WITH_MUNGE_TRUE WITH_MUNGE_FALSE AUTHD_LIBS AUTHD_CFLAGS WITH_AUTHD_TRUE WITH_AUTHD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -24650,6 +24650,91 @@ fi
+ echo "$as_me:$LINENO: checking for job_attachpid in -ljob" >&5
+echo $ECHO_N "checking for job_attachpid in -ljob... $ECHO_C" >&6
+if test "${ac_cv_lib_job_job_attachpid+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljob $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char job_attachpid ();
+int
+main ()
+{
+job_attachpid ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_job_job_attachpid=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_job_job_attachpid=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_job_job_attachpid" >&5
+echo "${ECHO_T}$ac_cv_lib_job_job_attachpid" >&6
+if test $ac_cv_lib_job_job_attachpid = yes; then
+ ac_have_sgi_job="yes"
+fi
+
+ echo "$as_me:$LINENO: checking for SGI job container support" >&5
+echo $ECHO_N "checking for SGI job container support... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: ${ac_have_sgi_job=no}" >&5
+echo "${ECHO_T}${ac_have_sgi_job=no}" >&6
+
+
+if test "x$ac_have_sgi_job" = "xyes"; then
+ HAVE_SGI_JOB_TRUE=
+ HAVE_SGI_JOB_FALSE='#'
+else
+ HAVE_SGI_JOB_TRUE='#'
+ HAVE_SGI_JOB_FALSE=
+fi
+
+
+
+
echo "$as_me:$LINENO: checking for whether to include readline suport" >&5
echo $ECHO_N "checking for whether to include readline suport... $ECHO_C" >&6
@@ -25209,7 +25294,7 @@ _ACEOF
- ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/srun/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/plugins/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/maui/Makefile src/plugins/sched/maui/wiki/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
+ ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile src/Makefile src/api/Makefile src/common/Makefile src/sacct/Makefile src/srun/Makefile src/slurmd/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/plugins/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/jobacct/Makefile src/plugins/jobacct/linux/Makefile src/plugins/jobacct/aix/Makefile src/plugins/jobacct/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/maui/Makefile src/plugins/sched/maui/wiki/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/block_allocator/Makefile src/plugins/select/bluegene/plugin/Makefile src/plugins/select/linear/Makefile src/plugins/select/cons_res/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/slurmctld/Makefile testsuite/slurm_unit/slurmd/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile"
cat >confcache <<\_ACEOF
@@ -25415,6 +25500,13 @@ echo "$as_me: error: conditional \"HAVE_FEDERATION\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_SGI_JOB_TRUE}" && test -z "${HAVE_SGI_JOB_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_SGI_JOB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_SGI_JOB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${WITH_MUNGE_TRUE}" && test -z "${WITH_MUNGE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"WITH_MUNGE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -25912,6 +26004,7 @@ do
"src/plugins/proctrack/pgid/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/pgid/Makefile" ;;
"src/plugins/proctrack/linuxproc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/linuxproc/Makefile" ;;
"src/plugins/proctrack/rms/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/rms/Makefile" ;;
+ "src/plugins/proctrack/sgi_job/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/proctrack/sgi_job/Makefile" ;;
"src/plugins/sched/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/Makefile" ;;
"src/plugins/sched/backfill/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/backfill/Makefile" ;;
"src/plugins/sched/builtin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/sched/builtin/Makefile" ;;
@@ -26163,6 +26256,8 @@ s,@FEDERATION_LDFLAGS@,$FEDERATION_LDFLAGS,;t t
s,@HAVE_FEDERATION_TRUE@,$HAVE_FEDERATION_TRUE,;t t
s,@HAVE_FEDERATION_FALSE@,$HAVE_FEDERATION_FALSE,;t t
s,@HAVE_FEDERATION@,$HAVE_FEDERATION,;t t
+s,@HAVE_SGI_JOB_TRUE@,$HAVE_SGI_JOB_TRUE,;t t
+s,@HAVE_SGI_JOB_FALSE@,$HAVE_SGI_JOB_FALSE,;t t
s,@READLINE_LIBS@,$READLINE_LIBS,;t t
s,@SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
s,@SSL_LIBS@,$SSL_LIBS,;t t
diff --git a/configure.ac b/configure.ac
index 9e8654ca999..bf26f51dd00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,10 @@ X_AC_FEDERATION
AM_CONDITIONAL(HAVE_FEDERATION, test "x$ac_have_federation" = "xyes")
AC_SUBST(HAVE_FEDERATION)
+dnl check for SGI job container support
+dnl
+X_AC_SGI_JOB
+
dnl Check for whether to include readline support
dnl
X_AC_READLINE
@@ -243,6 +247,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/proctrack/pgid/Makefile
src/plugins/proctrack/linuxproc/Makefile
src/plugins/proctrack/rms/Makefile
+ src/plugins/proctrack/sgi_job/Makefile
src/plugins/sched/Makefile
src/plugins/sched/backfill/Makefile
src/plugins/sched/builtin/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 70e2bc36f41..83558274f05 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -129,6 +130,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 666be6fb727..4650a21811b 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/doc/html/configurator.html b/doc/html/configurator.html
index 26c6104d16b..8eb376fb398 100644
--- a/doc/html/configurator.html
+++ b/doc/html/configurator.html
@@ -347,6 +347,9 @@ parent process ID records, required for MPICH-GM use, processes can escape
from SLURM control<BR>
<input type="radio" name="proctrack_type" value="rms"> <B>RMS</B>: Use Quadrics
kernel infrastructure, recommended for systems where this is available<BR>
+<input type="radio" name="proctrack_type" value="sgi_job"> <B>SGI's PAGG
+module</B>: Use <A HREF="http://oss.sgi.com/projects/pagg/">SGI's Process
+Aggregates (PAGG) kernel module</A>, recommended where available<BR>
<P>
<H2>Resource Selection</H2>
@@ -460,6 +463,6 @@ before terminating all remaining tasks. A value of zero indicates unlimited wait
</FORM>
<HR>
<p class="footer">UCRL-WEB-217616<br>
-Last modified 23 April 2006</p>
+Last modified 6 June 2006</p>
</BODY>
diff --git a/doc/html/proctrack_plugins.shtml b/doc/html/proctrack_plugins.shtml
index 7f953e7ba13..260a3380424 100644
--- a/doc/html/proctrack_plugins.shtml
+++ b/doc/html/proctrack_plugins.shtml
@@ -32,7 +32,11 @@ not entirely reliable for process tracking.</li>
<li><b>rms</b>—Use a Quadrics RMS kernel patch to
establish what processes are members of a SLURM job.
NOTE: This requires a kernel patch that records
-ever process creation and termination.</li>
+every process creation and termination.</li>
+<li><b>sgj_job</b>—Use <a href="http://oss.sgi.com/projects/pagg/">
+SGI's Process Aggregates (PAGG) kernel module</a>.
+NOTE: This kernel module records every process creation
+and termination.</li>
</ul>
<p>The <span class="commandline">plugin_name</span> and
@@ -108,7 +112,8 @@ its errno to an appropriate value to indicate the reason for failure.</p>
<p class="footer"><a href="#top">top</a></p>
<p class="commandline">int slurm_container_destroy (uint32_t id);</p>
-<p style="margin-left:.2in"><b>Description</b>: Destroy a job container.
+<p style="margin-left:.2in"><b>Description</b>: Destroy or otherwise
+invalidate a job container.
This does not imply the container is empty, just that it is no longer
needed.</p>
<p style="margin-left:.2in"><b>Arguments</b>:
@@ -135,6 +140,6 @@ mechanism outlined for SLURM plugins.</p>
<p class="footer"><a href="#top">top</a></p>
-<p style="text-align:center;">Last modified 20 March 2006</p>
+<p style="text-align:center;">Last modified 6 June 2006</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index acb813716de..b80cdf95faa 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -128,6 +129,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index f907e7f08af..ec9e041fb39 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1,4 +1,4 @@
-.TH "slurm.conf" "5" "May 2006" "slurm.conf 1.1" "Slurm configuration file"
+.TH "slurm.conf" "5" "June 2006" "slurm.conf 1.1" "Slurm configuration file"
.SH "NAME"
slurm.conf \- Slurm configuration file
.SH "DESCRIPTION"
@@ -238,16 +238,29 @@ on SPANK plugins, see the \fBspank\fR(8) manual.
Identifies the plugin to be used for process tracking.
The slurmd daemon uses this mechanism to identify all processes
which are children of processes it spawns for a user job.
-Acceptable values at present include
-"proctrack/aix" (which uses an AIX kernel extenstion and is
-the default for AIX systems),
-"proctrack/linuxproc" (which uses linux process tree),
-"proctrack/rms" (which uses Quadrics kernel patch and is the
-default if "SwitchType=switch/elan") and
-"proctrack/pgid" (which is the default for all other systems).
-The slurmd daemon must be restarted for a change in ProctrackType
+The slurmd daemon must be restarted for a change in ProctrackType
to take effect.
NOTE: "proctrack/linuxproc" is not compatable with "swich/elan."
+Acceptable values at present include:
+.RS
+.TP
+\fBproctrack/aix\fR which uses an AIX kernel extenstion and is
+the default for AIX systems
+.TP
+\fBproctrack/linuxproc\fR which uses linux process tree using
+parent process IDs
+.TP
+\fBproctrack/rms\fR which uses Quadrics kernel patch and is the
+default if "SwitchType=switch/elan"
+.TP
+\fBproctrack/sgi_job\fR which uses SGI's Process Aggregates (PAGG)
+kernel module, see \fIhttp://oss.sgi.comm/projects/pagg/\fR
+for more information
+.TP
+\fBproctrack/pgid\fR which uses process group IDs and is the
+default for all other systems
+.RE
+
.TP
\fBProlog\fR
Fully qualified pathname of a script to execute as user root on every
diff --git a/etc/slurm.conf.example b/etc/slurm.conf.example
index 8789d9e2b2c..85004c35743 100644
--- a/etc/slurm.conf.example
+++ b/etc/slurm.conf.example
@@ -257,14 +257,17 @@
# "ProctrackType" : the type of process tracking mechanism
# "proctrack/aix" : use AIX kernel extension for process tracking,
# the default value on AIX computers
-# "proctrack/pgid" : use Unix process group ID for process tracking,
-# the default value on all other computers
# "proctrack/linuxproc" : use parent process ID to establish process
# tree, required for MPICH-GM use
# "proctrack/rms" : use Quadrics kernal infrastructure to track
# processes, strongly recommended for systems
# with a Quadrics switch
-#
+# "proctrack/sgi_job : which uses SGI’s Process Aggregates (PAGG)
+# kernel module, see http://oss.sgi.comm/projects/pagg/
+# for more information
+# "proctrack/pgid" : use Unix process group ID for process tracking,
+# the default value on all other computers
+
# ProctrackType=proctrack/pgid
diff --git a/src/Makefile.in b/src/Makefile.in
index f9725666274..2eda8b2bee7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -129,6 +130,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 43f6b208544..168cafb9b75 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -159,6 +160,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/api/signal.c b/src/api/signal.c
index 0cf04ad1b9e..ac78ee43f61 100644
--- a/src/api/signal.c
+++ b/src/api/signal.c
@@ -113,7 +113,6 @@ slurm_signal_job (uint32_t job_id, uint16_t signal)
fail1:
if (rc) {
slurm_seterrno_ret(rc);
- return SLURM_FAILURE;
} else {
return SLURM_SUCCESS;
}
@@ -180,8 +179,10 @@ fail:
/*
* Retrieve the host address from the "allocation" structure for each
* node in the specified "step".
+ *
+ * Returns 0 on success, -1 on error.
*/
-static void
+static int
_get_step_addresses(const job_step_info_t *step,
const resource_allocation_response_msg_t *allocation,
slurm_addr **address, int *num_addresses)
@@ -195,7 +196,11 @@ _get_step_addresses(const job_step_info_t *step,
int i;
alloc_nodes = hostset_create(allocation->node_list);
+ if (alloc_nodes == NULL)
+ return -1;
step_nodes = hostset_create(step->nodes);
+ if (step_nodes == NULL)
+ return -1;
step_nodes_it = hostset_iterator_create(step_nodes);
num_nodes = hostset_count(step_nodes);
@@ -212,6 +217,8 @@ _get_step_addresses(const job_step_info_t *step,
*address = addrs;
*num_addresses = num_nodes;
+
+ return 0;
}
static int
@@ -227,8 +234,9 @@ _signal_job_step(const job_step_info_t *step,
int rc = SLURM_SUCCESS;
int i;
- _get_step_addresses(step, allocation,
- &address, &num_nodes);
+ if (_get_step_addresses(step, allocation,
+ &address, &num_nodes) == -1)
+ return SLURM_ERROR;
/* same remote procedure call for each node */
rpc.job_id = step->job_id;
@@ -502,8 +510,9 @@ _terminate_job_step(const job_step_info_t *step,
int rc = SLURM_SUCCESS;
int i;
- _get_step_addresses(step, allocation,
- &address, &num_nodes);
+ if (_get_step_addresses(step, allocation,
+ &address, &num_nodes) == -1)
+ return SLURM_ERROR;
/*
* Send REQUEST_TERMINATE_TASKS to all nodes of the step
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 6211594ebf4..9868d0a6bc4 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -193,6 +194,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 5c69586f88e..0b91e16feeb 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -129,6 +130,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 1027e8ee987..098cc0b72f7 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index e45e42e85d3..5d304bd809d 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index c922304802d..28fe3062f9f 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,6 +152,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index ff0e1641c13..b1f3c981932 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index bc012a4f767..824df5d6901 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index d79f80805f3..42b3196fbc3 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -154,6 +155,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 0713b2ba16c..d1b14f3a613 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/Makefile.in b/src/plugins/jobacct/Makefile.in
index f483dbe7165..1031822cd84 100644
--- a/src/plugins/jobacct/Makefile.in
+++ b/src/plugins/jobacct/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/aix/Makefile.in b/src/plugins/jobacct/aix/Makefile.in
index 101061d9f04..9d1cfbe31c9 100644
--- a/src/plugins/jobacct/aix/Makefile.in
+++ b/src/plugins/jobacct/aix/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/linux/Makefile.in b/src/plugins/jobacct/linux/Makefile.in
index f7243f65a41..841421ec3de 100644
--- a/src/plugins/jobacct/linux/Makefile.in
+++ b/src/plugins/jobacct/linux/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobacct/none/Makefile.in b/src/plugins/jobacct/none/Makefile.in
index a6e87d11cbd..621fcf127f7 100644
--- a/src/plugins/jobacct/none/Makefile.in
+++ b/src/plugins/jobacct/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index 9ef50a1d854..f3f6031773c 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 20e30a9398f..f0dc621dd16 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index 4a27a681941..e602b290466 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 6d1d60f62a3..9d264c7bd05 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 9d9d52e6724..771f4e78b7d 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index a9ff8982274..ae584fe7847 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 3cf7b5fe215..9d05b0a258f 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index a5e6b23608f..44527a7afd9 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 0035f210058..56858fc2e74 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/Makefile.am b/src/plugins/proctrack/Makefile.am
index 738cdc2cf9f..e97e1a5fc5c 100644
--- a/src/plugins/proctrack/Makefile.am
+++ b/src/plugins/proctrack/Makefile.am
@@ -2,7 +2,11 @@
# Makefile for proctrack plugins
if HAVE_AIX_PROCTRACK
-SUBDIRS = aix pgid linuxproc rms
-else
-SUBDIRS = pgid linuxproc rms
+AIX_PROCTRACK = aix
endif
+
+if HAVE_SGI_JOB
+SGI_JOB = sgi_job
+endif
+
+SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) pgid linuxproc rms
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index ad23c3cc9d0..d2b44bbcf28 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -73,7 +74,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
uninstall-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = pgid linuxproc rms aix
+DIST_SUBDIRS = aix sgi_job pgid linuxproc rms
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
@@ -246,8 +249,9 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-@HAVE_AIX_PROCTRACK_FALSE@SUBDIRS = pgid linuxproc rms
-@HAVE_AIX_PROCTRACK_TRUE@SUBDIRS = aix pgid linuxproc rms
+@HAVE_AIX_PROCTRACK_TRUE@AIX_PROCTRACK = aix
+@HAVE_SGI_JOB_TRUE@SGI_JOB = sgi_job
+SUBDIRS = $(AIX_PROCTRACK) $(SGI_JOB) pgid linuxproc rms
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 050dda5f24c..0a23aeb23e3 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index be82999ceb1..d4e63a58d76 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 8698ee5d323..36f626c39b7 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 7be7bf67b10..deefe3d7238 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.am b/src/plugins/proctrack/sgi_job/Makefile.am
index e69de29bb2d..2d657e01bf6 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.am
+++ b/src/plugins/proctrack/sgi_job/Makefile.am
@@ -0,0 +1,15 @@
+# $Id: Makefile.am 4954 2005-05-26 22:04:39Z morrone $
+# Makefile for proctrack/sgi_job plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = proctrack_sgi_job.la
+
+proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
+proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS)
+# Don't need to add -ljob because we dlopen the .so to avoid
+# symbol collisions with slurm functions
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index e69de29bb2d..cfdcc9871f1 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -0,0 +1,553 @@
+# Makefile.in generated by automake 1.9 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id: Makefile.am 4954 2005-05-26 22:04:39Z morrone $
+# Makefile for proctrack/sgi_job plugin
+
+SOURCES = $(proctrack_sgi_job_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = src/plugins/proctrack/sgi_job
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
+ $(top_srcdir)/auxdir/slurm.m4 \
+ $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
+ $(top_srcdir)/auxdir/x_ac_affinity.m4 \
+ $(top_srcdir)/auxdir/x_ac_aix.m4 \
+ $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
+ $(top_srcdir)/auxdir/x_ac_debug.m4 \
+ $(top_srcdir)/auxdir/x_ac_elan.m4 \
+ $(top_srcdir)/auxdir/x_ac_federation.m4 \
+ $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
+ $(top_srcdir)/auxdir/x_ac_munge.m4 \
+ $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
+ $(top_srcdir)/auxdir/x_ac_pam.m4 \
+ $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
+ $(top_srcdir)/auxdir/x_ac_readline.m4 \
+ $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
+ $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
+ $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+proctrack_sgi_job_la_LIBADD =
+am_proctrack_sgi_job_la_OBJECTS = proctrack_sgi_job.lo
+proctrack_sgi_job_la_OBJECTS = $(am_proctrack_sgi_job_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/slurm
+depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(proctrack_sgi_job_la_SOURCES)
+DIST_SOURCES = $(proctrack_sgi_job_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTHD_CFLAGS = @AUTHD_CFLAGS@
+AUTHD_LIBS = @AUTHD_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BG_INCLUDES = @BG_INCLUDES@
+BG_LDFLAGS = @BG_LDFLAGS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CMD_LDFLAGS = @CMD_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_MODULES_FALSE = @DEBUG_MODULES_FALSE@
+DEBUG_MODULES_TRUE = @DEBUG_MODULES_TRUE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ELAN_LIBS = @ELAN_LIBS@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FEDERATION_LDFLAGS = @FEDERATION_LDFLAGS@
+FFLAGS = @FFLAGS@
+HAVE_AIX = @HAVE_AIX@
+HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
+HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
+HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
+HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_ELAN = @HAVE_ELAN@
+HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
+HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
+HAVE_FEDERATION = @HAVE_FEDERATION@
+HAVE_FEDERATION_FALSE = @HAVE_FEDERATION_FALSE@
+HAVE_FEDERATION_TRUE = @HAVE_FEDERATION_TRUE@
+HAVE_NUMA_FALSE = @HAVE_NUMA_FALSE@
+HAVE_NUMA_TRUE = @HAVE_NUMA_TRUE@
+HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
+HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
+HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
+HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
+HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
+HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
+HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
+HAVE_UNSETENV_FALSE = @HAVE_UNSETENV_FALSE@
+HAVE_UNSETENV_TRUE = @HAVE_UNSETENV_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LDFLAGS = @LIB_LDFLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
+MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
+MUNGE_LIBS = @MUNGE_LIBS@
+NCURSES = @NCURSES@
+NUMA_LIBS = @NUMA_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROCTRACKDIR = @PROCTRACKDIR@
+PROJECT = @PROJECT@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
+RELEASE = @RELEASE@
+SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
+SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SLURMCTLD_PORT = @SLURMCTLD_PORT@
+SLURMD_PORT = @SLURMD_PORT@
+SLURM_API_AGE = @SLURM_API_AGE@
+SLURM_API_CURRENT = @SLURM_API_CURRENT@
+SLURM_API_MAJOR = @SLURM_API_MAJOR@
+SLURM_API_REVISION = @SLURM_API_REVISION@
+SLURM_API_VERSION = @SLURM_API_VERSION@
+SLURM_MAJOR = @SLURM_MAJOR@
+SLURM_MICRO = @SLURM_MICRO@
+SLURM_MINOR = @SLURM_MINOR@
+SLURM_VERSION = @SLURM_VERSION@
+SO_LDFLAGS = @SO_LDFLAGS@
+SSL_CPPFLAGS = @SSL_CPPFLAGS@
+SSL_LDFLAGS = @SSL_LDFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WITH_AUTHD_FALSE = @WITH_AUTHD_FALSE@
+WITH_AUTHD_TRUE = @WITH_AUTHD_TRUE@
+WITH_GNU_LD_FALSE = @WITH_GNU_LD_FALSE@
+WITH_GNU_LD_TRUE = @WITH_GNU_LD_TRUE@
+WITH_MUNGE_FALSE = @WITH_MUNGE_FALSE@
+WITH_MUNGE_TRUE = @WITH_MUNGE_TRUE@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+AUTOMAKE_OPTIONS = foreign
+PLUGIN_FLAGS = - -module -avoid-version --export-dynamic
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+pkglib_LTLIBRARIES = proctrack_sgi_job.la
+proctrack_sgi_job_la_SOURCES = proctrack_sgi_job.c
+proctrack_sgi_job_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(OTHER_FLAGS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/proctrack/sgi_job/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/plugins/proctrack/sgi_job/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-pkglibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ done
+
+clean-pkglibLTLIBRARIES:
+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+proctrack_sgi_job.la: $(proctrack_sgi_job_la_OBJECTS) $(proctrack_sgi_job_la_DEPENDENCIES)
+ $(LINK) -rpath $(pkglibdir) $(proctrack_sgi_job_la_LDFLAGS) $(proctrack_sgi_job_la_OBJECTS) $(proctrack_sgi_job_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctrack_sgi_job.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(pkglibdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-pkglibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-pkglibLTLIBRARIES
+
+# Don't need to add -ljob because we dlopen the .so to avoid
+# symbol collisions with slurm functions
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
index e69de29bb2d..7be9301118c 100644
--- a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
+++ b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
@@ -0,0 +1,223 @@
+/*****************************************************************************\
+ * proctrack_sgi_job.c - process tracking via SGI's "job" module.
+ *****************************************************************************
+ * Copyright (C) 2005 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Mark Grondona <mgrondona@llnl.gov>
+ * UCRL-CODE-217948.
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ * SLURM is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+\*****************************************************************************/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <dlfcn.h>
+
+#include <slurm/slurm.h>
+#include <slurm/slurm_errno.h>
+#include "src/common/log.h"
+
+#include "src/slurmd/slurmstepd/slurmstepd_job.h"
+
+
+const char plugin_name[] = "Process tracking via SGI job module";
+const char plugin_type[] = "proctrack/sgi_job";
+const uint32_t plugin_version = 90;
+
+/*
+ * We can't include <job.h> since its prototypes conflict with some
+ * of SLURM's. Instead, put important function protypes and
+ * the jid_t typedef here:
+ */
+typedef uint64_t jid_t;
+
+typedef jid_t (*create_f) (jid_t jid_requested, uid_t uid, int options);
+typedef jid_t (*getjid_f) (jid_t jid);
+typedef jid_t (*waitjid_f) (jid_t jid, int *status, int options);
+typedef int (*killjid_f) (jid_t jid, int sig);
+typedef jid_t (*detachpid_f) (pid_t pid);
+typedef jid_t (*attachpid_f) (pid_t pid, jid_t jid_requested);
+
+/*
+ * Handle to libjob.so
+ */
+static void *libjob_handle = NULL;
+
+/*
+ * libjob operations we'll need in this plugin
+ */
+static struct job_operations {
+ create_f create;
+ getjid_f getjid;
+ waitjid_f waitjid;
+ killjid_f killjid;
+ detachpid_f detachpid;
+ attachpid_f attachpid;
+} job_ops;
+
+
+/*
+ * init() is called when the plugin is loaded, before any other functions
+ * are called. Put global initialization here.
+ */
+int init (void)
+{
+ /* We dlopen() libjob.so instead of directly linking to it
+ * because of symbols like "job_create" in libjob which
+ * conflict with symbols in slurmd. dlopening the library
+ * prevents these symbols from going into the global namespace.
+ */
+ if ((libjob_handle = dlopen ("libjob.so", RTLD_LAZY)) == NULL) {
+ error ("Unable to open libjob.so: %m");
+ return SLURM_ERROR;
+ }
+
+ job_ops.create = dlsym (libjob_handle, "job_create");
+ job_ops.getjid = dlsym (libjob_handle, "job_getjid");
+ job_ops.waitjid = dlsym (libjob_handle, "job_waitjid");
+ job_ops.killjid = dlsym (libjob_handle, "job_killjid");
+ job_ops.detachpid = dlsym (libjob_handle, "job_detachpid");
+ job_ops.attachpid = dlsym (libjob_handle, "job_attachpid");
+
+ if (!job_ops.create)
+ error ("Unable to resolve job_create in libjob.so");
+ if (!job_ops.getjid)
+ error ("Unable to resolve job_getjid in libjob.so");
+ if (!job_ops.waitjid)
+ error ("Unable to resolve job_waitjid in libjob.so");
+ if (!job_ops.killjid)
+ error ("Unable to resolve job_killjid in libjob.so");
+ if (!job_ops.detachpid)
+ error ("Unable to resolve job_detachpid in libjob.so");
+ if (!job_ops.attachpid)
+ error ("Unable to resolve job_attachpid in libjob.so");
+
+ info ("successfully loaded libjob.so");
+ return SLURM_SUCCESS;
+}
+
+int fini (void)
+{
+ dlclose (libjob_handle);
+ return SLURM_SUCCESS;
+}
+
+jid_t _job_create (jid_t jid, uid_t uid, int options)
+{
+ return ((*job_ops.create) (jid, uid, options));
+}
+
+jid_t _job_getjid (pid_t pid)
+{
+ return ((*job_ops.getjid) (pid));
+}
+
+jid_t _job_waitjid (jid_t jid, int *status, int options)
+{
+ return ((*job_ops.waitjid) (jid, status, options));
+}
+
+int _job_killjid (jid_t jid, int sig)
+{
+ return ((*job_ops.killjid) (jid, sig));
+}
+
+int _job_detachpid (pid_t pid)
+{
+ return ((*job_ops.detachpid) (pid));
+}
+
+int _job_attachpid (pid_t pid, jid_t jid)
+{
+ return ((*job_ops.attachpid) (pid, jid));
+}
+
+
+int slurm_container_create (slurmd_job_t *job)
+{
+ jid_t jid;
+ job->cont_id = (uint32_t) -1;
+
+ if (!libjob_handle)
+ init();
+
+ if ((jid = _job_create (0, job->uid, 0)) == (jid_t) -1) {
+ error ("Failed to create job container: %m");
+ return SLURM_ERROR;
+ }
+ debug ("created jid 0x%08lx\n", jid);
+
+ return SLURM_SUCCESS;
+}
+
+int slurm_container_add (slurmd_job_t *job, pid_t pid)
+{
+ if (job->cont_id == (uint32_t) -1) {
+ job->cont_id = (uint32_t) _job_getjid (getpid());
+ /*
+ * Detach ourselves from the job container now that there
+ * is at least one other process in it.
+ */
+ if (_job_detachpid (getpid()) == (jid_t) -1) {
+ error ("Failed to detach from job container: %m");
+ return SLURM_ERROR;
+ }
+ }
+ return SLURM_SUCCESS;
+}
+
+int slurm_container_signal (uint32_t id, int sig)
+{
+ if ( (_job_killjid ((jid_t) id, sig) < 0)
+ && (errno != ENODATA) && (errno != EBADF) )
+ return (SLURM_ERROR);
+ return (SLURM_SUCCESS);
+}
+
+int slurm_container_destroy (uint32_t id)
+{
+ _job_waitjid ((jid_t) id, NULL, 0);
+ /* Assume any error means job doesn't exist. Therefore,
+ * return SUCCESS to slurmd so it doesn't retry continuously
+ */
+ return SLURM_SUCCESS;
+}
+
+uint32_t slurm_container_find (pid_t pid)
+{
+ jid_t jid;
+
+ if ((jid = _job_getjid (pid)) == (jid_t) -1)
+ return ((uint32_t) 0); /* XXX: What to return on error? */
+
+ return ((uint32_t) jid);
+}
+
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 59cde186f8a..14b5809aa4a 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 9a24a04bb96..b8b16aba7cd 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 29aa51bce1f..b814ddded21 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index 12ad1263fd1..ce00febab00 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/maui/Makefile.in b/src/plugins/sched/maui/Makefile.in
index 2260c03410a..68dc3dc1107 100644
--- a/src/plugins/sched/maui/Makefile.in
+++ b/src/plugins/sched/maui/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/sched/maui/wiki/Makefile.in b/src/plugins/sched/maui/wiki/Makefile.in
index c39d8da5eff..e73e7f9a9ed 100644
--- a/src/plugins/sched/maui/wiki/Makefile.in
+++ b/src/plugins/sched/maui/wiki/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -182,6 +183,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 3ccee6c04ae..0a4e7a94a2f 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 2a37b838087..19ac40aec12 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 520402793a6..1c7951640c8 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -141,6 +142,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index 8b1cf5ede07..d1c03d6c4dc 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -171,6 +172,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index bb36cce62af..8c4850dd00a 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index c42a85defd4..4196f0ff538 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 0a7c500d53c..be881b4ba25 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index a6b1f611818..1a680a4d043 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -155,6 +156,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 98f98a495a4..118a1c57e4b 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -159,6 +160,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 99af1081ed8..045d564e148 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index f3a8ad05532..a3ed4493720 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -130,6 +131,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index e38788dbaa4..c86065e0a27 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -159,6 +160,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 367f4bc82f4..2a94117a891 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index f9d4c92fcfa..ca30a13bf85 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index ac002295a62..829f54e3fae 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -149,6 +150,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index 3fa942034d7..d87f555a147 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -148,6 +149,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index f79d076c434..6d39631344a 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -147,6 +148,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 510798181bb..ab91cb7a243 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -150,6 +151,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 081664b422b..32cea24a57a 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -152,6 +153,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 0bed8a53663..73c599d4634 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -1044,8 +1044,8 @@ extern int kill_job_by_part_name(char *part_name)
job_ptr->end_time = job_ptr->suspend_time;
else
job_ptr->end_time = time(NULL);
- deallocate_nodes(job_ptr, false, suspended);
job_completion_logger(job_ptr);
+ deallocate_nodes(job_ptr, false, suspended);
}
}
@@ -1118,8 +1118,8 @@ extern int kill_running_job_by_node_name(char *node_name, bool step_test)
job_ptr->end_time = job_ptr->suspend_time;
else
job_ptr->end_time = time(NULL);
- deallocate_nodes(job_ptr, false, suspended);
job_completion_logger(job_ptr);
+ deallocate_nodes(job_ptr, false, suspended);
} else {
error("Removing failed node %s from job_id %u",
node_name, job_ptr->job_id);
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index df6476c6f26..9508c03e654 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -129,6 +130,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmd/common/proctrack.h b/src/slurmd/common/proctrack.h
index 0cc0a89cb00..a648173bcc5 100644
--- a/src/slurmd/common/proctrack.h
+++ b/src/slurmd/common/proctrack.h
@@ -1,7 +1,7 @@
/*****************************************************************************\
* proctrack.h - Define process tracking plugin functions.
*****************************************************************************
- * Copyright (C) 2005 The Regents of the University of California.
+ * Copyright (C) 2005-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Morris Jette <jette1@llnl.gov>
* UCRL-CODE-217948.
@@ -83,7 +83,8 @@ extern int slurm_container_signal(uint32_t cont_id, int signal);
/*
- * Destroy a container, any processes within the container are not effected
+ * Destroy or otherwise invalidate a container,
+ * any processes within the container are not affected
* cont_id IN - container ID as returned by slurm_container_create()
*
* Returns a SLURM errno.
@@ -93,7 +94,7 @@ extern int slurm_container_destroy(uint32_t cont_id);
/*
* Get container ID for give process ID
*
- * Returns a SLURM errno.
+ * Returns zero if no container found for the given pid.
*/
extern uint32_t slurm_container_find(pid_t pid);
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index eeca7f28fd4..cd284b87741 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -160,6 +161,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 33e8128431e..1cc94e97260 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -156,6 +157,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 325468e08cf..aef51a6368b 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -66,6 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -161,6 +162,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index 85cd5b1afe6..5ec10a012bb 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -151,6 +152,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index c2570b00861..c13c30e6b23 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -152,6 +153,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 233bd10d378..9949358100e 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -136,6 +137,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index ef35c9fab06..90f64b6e239 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -120,6 +121,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
@@ -304,11 +307,11 @@ EXTRA_DIST = \
test1.49 \
test1.50 \
test1.51 \
- test1.52 \
- test1.53 \
- test1.54 \
- test1.55 \
- test1.56 \
+ test1.52 \
+ test1.53 \
+ test1.54 \
+ test1.55 \
+ test1.56 \
test1.80 \
test1.81 \
test1.82 \
@@ -321,8 +324,8 @@ EXTRA_DIST = \
test1.88.prog.c \
test1.89 \
test1.89.prog.c \
- test1.90 \
- test1.90.prog.c \
+ test1.90 \
+ test1.90.prog.c \
test2.1 \
test2.2 \
test2.3 \
@@ -339,8 +342,8 @@ EXTRA_DIST = \
test3.4 \
test3.5 \
test3.6 \
- test3.7 \
- test3.7.prog.c \
+ test3.7 \
+ test3.7.prog.c \
test3.8 \
test4.1 \
test4.2 \
@@ -414,20 +417,20 @@ EXTRA_DIST = \
test11.3 \
test11.4 \
test11.5 \
- test11.6 \
- test11.7 \
+ test11.6 \
+ test11.7 \
test12.1 \
test12.2 \
test12.2.prog.c \
test13.1 \
- test14.1 \
- test14.2 \
- test14.3 \
- test14.4 \
- test14.5 \
- test14.6 \
- test14.7 \
- test14.8 \
+ test14.1 \
+ test14.2 \
+ test14.3 \
+ test14.4 \
+ test14.5 \
+ test14.6 \
+ test14.7 \
+ test14.8 \
usleep
all: all-am
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 50a4eebcb71..56fa10ff808 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -127,6 +128,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 40a92c79217..ffa4b60649c 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -147,6 +148,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index 0e3d62f9945..b7edd56e14f 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -178,6 +179,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 99b5513dbc3..562cfcceef6 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -190,6 +191,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index bc3357fea3f..a8a428519a0 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -120,6 +121,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 001fbe9fa1e..5f523ec2c86 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/x_ac_ptrace.m4 \
$(top_srcdir)/auxdir/x_ac_readline.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
$(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -120,6 +121,8 @@ HAVE_PAM_FALSE = @HAVE_PAM_FALSE@
HAVE_PAM_TRUE = @HAVE_PAM_TRUE@
HAVE_SCHED_SETAFFINITY_FALSE = @HAVE_SCHED_SETAFFINITY_FALSE@
HAVE_SCHED_SETAFFINITY_TRUE = @HAVE_SCHED_SETAFFINITY_TRUE@
+HAVE_SGI_JOB_FALSE = @HAVE_SGI_JOB_FALSE@
+HAVE_SGI_JOB_TRUE = @HAVE_SGI_JOB_TRUE@
HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
HAVE_SOME_CURSES_FALSE = @HAVE_SOME_CURSES_FALSE@
HAVE_SOME_CURSES_TRUE = @HAVE_SOME_CURSES_TRUE@
--
GitLab