From 82c1264c600f74b746c6db1fa4a54efdc7336b36 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 9 Jun 2006 18:20:19 +0000
Subject: [PATCH] Added support for OS X.
---
Makefile.in | 2 +
NEWS | 1 +
aclocal.m4 | 1 +
auxdir/Makefile.in | 2 +
auxdir/x_ac_aix.m4 | 10 +-
auxdir/x_ac_setpgrp.m4 | 22 +++
config.h.in | 21 +++
configure | 136 ++++++++++++++----
configure.ac | 12 +-
doc/Makefile.in | 2 +
doc/html/Makefile.in | 2 +
doc/html/news.shtml | 3 +-
doc/html/platforms.shtml | 3 +-
doc/man/Makefile.in | 2 +
src/Makefile.in | 2 +
src/api/Makefile.in | 2 +
src/api/pmi.c | 1 +
src/common/Makefile.in | 2 +
src/common/global_srun.c | 10 +-
src/common/global_srun.h | 6 +-
src/common/macros.h | 5 +
src/common/plugstack.c | 4 +-
src/common/strlcpy.c | 8 ++
src/common/strlcpy.h | 25 ++--
src/plugins/Makefile.in | 2 +
src/plugins/auth/Makefile.in | 2 +
src/plugins/auth/authd/Makefile.in | 2 +
src/plugins/auth/munge/Makefile.in | 2 +
src/plugins/auth/none/Makefile.in | 2 +
src/plugins/checkpoint/Makefile.in | 2 +
src/plugins/checkpoint/aix/Makefile.in | 2 +
src/plugins/checkpoint/none/Makefile.in | 2 +
src/plugins/jobacct/Makefile.in | 2 +
src/plugins/jobacct/aix/Makefile.in | 2 +
src/plugins/jobacct/common/common_slurmctld.c | 5 +
src/plugins/jobacct/linux/Makefile.in | 2 +
src/plugins/jobacct/none/Makefile.in | 2 +
src/plugins/jobcomp/Makefile.in | 2 +
src/plugins/jobcomp/filetxt/Makefile.in | 2 +
src/plugins/jobcomp/none/Makefile.in | 2 +
src/plugins/jobcomp/script/Makefile.in | 2 +
src/plugins/mpi/Makefile.in | 2 +
src/plugins/mpi/lam/Makefile.in | 2 +
src/plugins/mpi/mpichgm/Makefile.in | 2 +
src/plugins/mpi/mpichgm/mpichgm.c | 3 +-
src/plugins/mpi/mvapich/Makefile.in | 2 +
src/plugins/mpi/mvapich/mvapich.c | 3 +-
src/plugins/mpi/none/Makefile.in | 2 +
src/plugins/proctrack/Makefile.in | 4 +-
src/plugins/proctrack/aix/Makefile.in | 2 +
src/plugins/proctrack/linuxproc/Makefile.in | 2 +
src/plugins/proctrack/pgid/Makefile.in | 2 +
src/plugins/proctrack/rms/Makefile.in | 2 +
src/plugins/proctrack/sgi_job/Makefile.in | 2 +
src/plugins/sched/Makefile.in | 2 +
src/plugins/sched/backfill/Makefile.in | 2 +
src/plugins/sched/builtin/Makefile.in | 2 +
src/plugins/sched/hold/Makefile.in | 2 +
src/plugins/sched/maui/Makefile.in | 2 +
src/plugins/sched/maui/wiki/Makefile.in | 2 +
src/plugins/select/Makefile.in | 2 +
src/plugins/select/bluegene/Makefile.in | 2 +
.../bluegene/block_allocator/Makefile.in | 2 +
.../select/bluegene/plugin/Makefile.in | 2 +
src/plugins/select/cons_res/Makefile.in | 2 +
src/plugins/select/linear/Makefile.in | 2 +
src/plugins/switch/Makefile.in | 2 +
src/plugins/switch/elan/Makefile.in | 2 +
src/plugins/switch/federation/Makefile.in | 2 +
.../switch/federation/switch_federation.c | 1 +
src/plugins/switch/none/Makefile.in | 2 +
src/plugins/task/Makefile.in | 2 +
src/plugins/task/affinity/Makefile.in | 2 +
src/plugins/task/none/Makefile.in | 2 +
src/sacct/Makefile.in | 2 +
src/sbcast/Makefile.in | 2 +
src/sbcast/opts.c | 1 +
src/sbcast/sbcast.c | 3 +-
src/scancel/Makefile.in | 2 +
src/scancel/opt.c | 12 +-
src/scontrol/Makefile.in | 2 +
src/sinfo/Makefile.in | 2 +
src/slurmctld/Makefile.in | 2 +
src/slurmctld/proc_req.c | 2 +-
src/slurmctld/sched_plugin.c | 6 +-
src/slurmctld/sched_plugin.h | 6 +-
src/slurmd/Makefile.in | 2 +
src/slurmd/common/run_script.c | 8 ++
src/slurmd/common/stepd_api.c | 1 +
src/slurmd/slurmd/Makefile.in | 2 +
src/slurmd/slurmd/get_mach_stat.c | 35 +++--
src/slurmd/slurmstepd/Makefile.in | 2 +
src/slurmd/slurmstepd/mgr.c | 2 +-
src/slurmd/slurmstepd/pam_ses.c | 9 +-
src/slurmd/slurmstepd/pdebug.c | 4 +-
src/slurmd/slurmstepd/pdebug.h | 1 +
src/slurmd/slurmstepd/task.c | 4 +
src/smap/Makefile.in | 2 +
src/squeue/Makefile.in | 2 +
src/srun/Makefile.am | 2 +-
src/srun/Makefile.in | 4 +-
src/srun/fname.c | 1 +
src/srun/fname.h | 10 +-
src/srun/msg.c | 4 +-
src/srun/opt.c | 7 +
src/srun/opt.h | 21 +--
src/srun/signals.c | 9 +-
src/srun/srun.c | 4 +-
src/srun/srun_job.c | 2 +-
testsuite/Makefile.in | 2 +
testsuite/expect/Makefile.in | 2 +
testsuite/slurm_unit/Makefile.in | 2 +
testsuite/slurm_unit/api/Makefile.in | 2 +
testsuite/slurm_unit/api/manual/Makefile.in | 2 +
testsuite/slurm_unit/common/Makefile.in | 2 +
testsuite/slurm_unit/slurmctld/Makefile.in | 2 +
testsuite/slurm_unit/slurmd/Makefile.in | 2 +
117 files changed, 467 insertions(+), 119 deletions(-)
create mode 100644 auxdir/x_ac_setpgrp.m4
diff --git a/Makefile.in b/Makefile.in
index 41bf1da687f..51b43a66013 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -164,6 +165,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/NEWS b/NEWS
index f0984ff67c0..85812964b05 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ documents those changes that are of interest to users and admins.
flag at batch job launch time.
-- Added new configuration parameter MessageTimeout (replaces #define in
the code)
+ -- Added support for OSX build.
* Changes in SLURM 1.1.2
========================
diff --git a/aclocal.m4 b/aclocal.m4
index 56889bef8e7..d595a4b320d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7025,6 +7025,7 @@ m4_include([auxdir/x_ac_ncurses.m4])
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_setpgrp.m4])
m4_include([auxdir/x_ac_setproctitle.m4])
m4_include([auxdir/x_ac_sgi_job.m4])
m4_include([auxdir/x_ac_slurm_ssl.m4])
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index ac4e403b00d..e2a3b97e965 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -128,6 +129,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/auxdir/x_ac_aix.m4 b/auxdir/x_ac_aix.m4
index ac8fa632275..6b74aa89a68 100644
--- a/auxdir/x_ac_aix.m4
+++ b/auxdir/x_ac_aix.m4
@@ -28,12 +28,19 @@ AC_DEFUN([X_AC_AIX],
CFLAGS="-maix32 $CFLAGS"
CMD_LDFLAGS="$LDFLAGS -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000" # keep all common functions
fi
+ INSTALL_DIRS="-D"
ac_have_aix="yes"
ac_with_readline="no"
AC_DEFINE(HAVE_AIX, 1, [Define to 1 for AIX operating system])
AC_DEFINE(USE_ALIAS, 0,
[Define slurm_ prefix function aliases for plusins]) ;;
- *) ac_have_aix="no"
+ *darwin*)
+ INSTALL_DIRS="-d"
+ ac_have_aix="no"
+ AC_DEFINE(USE_ALIAS, 0,
+ [Define slurm_ prefix function aliases for plusins]) ;;
+ *) INSTALL_DIRS="-D"
+ ac_have_aix="no"
AC_DEFINE(USE_ALIAS, 1,
[Define slurm_ prefix function aliases for plugins]) ;;
esac
@@ -41,6 +48,7 @@ AC_DEFUN([X_AC_AIX],
AC_SUBST(CMD_LDFLAGS)
AC_SUBST(LIB_LDFLAGS)
AC_SUBST(SO_LDFLAGS)
+ AC_SUBST(INSTALL_DIRS)
AM_CONDITIONAL(HAVE_AIX, test "x$ac_have_aix" = "xyes")
AC_SUBST(HAVE_AIX, "$ac_have_aix")
diff --git a/auxdir/x_ac_setpgrp.m4 b/auxdir/x_ac_setpgrp.m4
new file mode 100644
index 00000000000..bfe6c644103
--- /dev/null
+++ b/auxdir/x_ac_setpgrp.m4
@@ -0,0 +1,22 @@
+##*****************************************************************************
+# $Id: x_ac_setpgrp.m4 8192 2006-05-25 00:15:05Z morrone $
+##*****************************************************************************
+# AUTHOR:
+# Morris Jette <jette1@llnl.gov>
+#
+# SYNOPSIS:
+# X_AC_SETPGRP
+#
+# DESCRIPTION:
+# Test argument count of setpgrp function.
+#
+# WARNINGS:
+# This macro must be placed after AC_PROG_CC or equivalent.
+##*****************************************************************************
+
+AC_DEFUN([X_AC_SETPGRP], [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
+ [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_TWO_ARGS, 1,
+ [Define to 1 if setpgrp takes two arguments.])],[])
+])
+
diff --git a/config.h.in b/config.h.in
index e7952668120..34ab25834e8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -46,6 +46,9 @@
/* Define to 1 if function EVP_MD_CTX_cleanup exists. */
#undef HAVE_EVP_MD_CTX_CLEANUP
+/* Define to 1 if you have the `fdatasync' function. */
+#undef HAVE_FDATASYNC
+
/* Define to 1 if running slurmd on front-end only */
#undef HAVE_FRONT_END
@@ -101,6 +104,9 @@
/* define if you have the PAM library */
#undef HAVE_PAM
+/* Define to 1 if you have the <pam/pam_appl.h> header file. */
+#undef HAVE_PAM_PAM_APPL_H
+
/* Define if you have Posix semaphores. */
#undef HAVE_POSIX_SEMS
@@ -122,6 +128,9 @@
/* Define to 1 if you have the `sched_setaffinity' function. */
#undef HAVE_SCHED_SETAFFINITY
+/* Define to 1 if you have the <security/pam_appl.h> header file. */
+#undef HAVE_SECURITY_PAM_APPL_H
+
/* Define to 1 if you have the `setproctitle' function. */
#undef HAVE_SETPROCTITLE
@@ -149,6 +158,12 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
/* Define to 1 if you have the `strsignal' function. */
#undef HAVE_STRSIGNAL
@@ -182,6 +197,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+#undef HAVE_SYS_VFS_H
+
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
@@ -256,6 +274,9 @@
/* Define to 1 if sched_getaffinity takes two arguments. */
#undef SCHED_GETAFFINITY_TWO_ARGS
+/* Define to 1 if setpgrp takes two arguments. */
+#undef SETPGRP_TWO_ARGS
+
/* Define if you need setproctitle padding */
#undef SETPROCTITLE_PS_PADDING
diff --git a/configure b/configure
index 40d36a85876..4cd7ad1cb0d 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 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_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 INSTALL_DIRS 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.
@@ -3324,6 +3324,7 @@ fi
CFLAGS="-maix32 $CFLAGS"
CMD_LDFLAGS="$LDFLAGS -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000" # keep all common functions
fi
+ INSTALL_DIRS="-D"
ac_have_aix="yes"
ac_with_readline="no"
@@ -3336,7 +3337,16 @@ cat >>confdefs.h <<\_ACEOF
#define USE_ALIAS 0
_ACEOF
;;
- *) ac_have_aix="no"
+ *darwin*)
+ INSTALL_DIRS="-d"
+ ac_have_aix="no"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_ALIAS 0
+_ACEOF
+ ;;
+ *) INSTALL_DIRS="-D"
+ ac_have_aix="no"
cat >>confdefs.h <<\_ACEOF
#define USE_ALIAS 1
@@ -3349,6 +3359,7 @@ _ACEOF
+
if test "x$ac_have_aix" = "xyes"; then
HAVE_AIX_TRUE=
HAVE_AIX_FALSE='#'
@@ -5646,7 +5657,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5649 "configure"' > conftest.$ac_ext
+ echo '#line 5660 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6754,7 +6765,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:6757:" \
+echo "$as_me:6768:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7804,11 +7815,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7807: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7818: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7811: \$? = $ac_status" >&5
+ echo "$as_me:7822: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8047,11 +8058,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8050: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8054: \$? = $ac_status" >&5
+ echo "$as_me:8065: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8107,11 +8118,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8110: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8114: \$? = $ac_status" >&5
+ echo "$as_me:8125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10292,7 +10303,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10295 "configure"
+#line 10306 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10390,7 +10401,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10393 "configure"
+#line 10404 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12579,11 +12590,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12582: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12586: \$? = $ac_status" >&5
+ echo "$as_me:12597: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12639,11 +12650,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12642: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12646: \$? = $ac_status" >&5
+ echo "$as_me:12657: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14000,7 +14011,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14003 "configure"
+#line 14014 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14098,7 +14109,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14101 "configure"
+#line 14112 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14935,11 +14946,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14938: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14949: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14942: \$? = $ac_status" >&5
+ echo "$as_me:14953: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14995,11 +15006,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14998: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15009: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15002: \$? = $ac_status" >&5
+ echo "$as_me:15013: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17030,11 +17041,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17033: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17044: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17037: \$? = $ac_status" >&5
+ echo "$as_me:17048: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17273,11 +17284,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17276: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17280: \$? = $ac_status" >&5
+ echo "$as_me:17291: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17333,11 +17344,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17336: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17347: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17340: \$? = $ac_status" >&5
+ echo "$as_me:17351: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19518,7 +19529,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19521 "configure"
+#line 19532 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19616,7 +19627,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19619 "configure"
+#line 19630 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20662,6 +20673,9 @@ fi
+
+
+
@@ -20670,7 +20684,8 @@ for ac_header in mcheck.h values.h socket.h sys/socket.h \
stdbool.h sys/ipc.h sys/shm.h sys/sem.h errno.h \
stdlib.h dirent.h pthread.h sys/prctl.h \
sysint.h inttypes.h termcap.h netdb.h sys/socket.h \
- sys/systemcfg.h ncurses.h curses.h sys/dr.h \
+ sys/systemcfg.h ncurses.h curses.h sys/dr.h sys/vfs.h \
+ pam/pam_appl.h security/pam_appl.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -21395,6 +21410,58 @@ done
+drn
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <unistd.h>
+int
+main ()
+{
+setpgrp(0,0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 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_objext'
+ { (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
+
+cat >>confdefs.h <<\_ACEOF
+#define SETPGRP_TWO_ARGS 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
# Test if sched_setaffinity function exists and argument count (it can vary)
@@ -22727,10 +22794,16 @@ fi
+
+
+
for ac_func in \
+ fdatasync \
hstrerror \
strerror \
mtrace \
+ strndup \
+ strlcpy \
strsignal \
inet_aton \
inet_ntop \
@@ -26182,6 +26255,7 @@ s,@MAINT@,$MAINT,;t t
s,@CMD_LDFLAGS@,$CMD_LDFLAGS,;t t
s,@LIB_LDFLAGS@,$LIB_LDFLAGS,;t t
s,@SO_LDFLAGS@,$SO_LDFLAGS,;t t
+s,@INSTALL_DIRS@,$INSTALL_DIRS,;t t
s,@HAVE_AIX_TRUE@,$HAVE_AIX_TRUE,;t t
s,@HAVE_AIX_FALSE@,$HAVE_AIX_FALSE,;t t
s,@HAVE_AIX@,$HAVE_AIX,;t t
diff --git a/configure.ac b/configure.ac
index bf26f51dd00..18150413420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,9 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \
stdbool.h sys/ipc.h sys/shm.h sys/sem.h errno.h \
stdlib.h dirent.h pthread.h sys/prctl.h \
sysint.h inttypes.h termcap.h netdb.h sys/socket.h \
- sys/systemcfg.h ncurses.h curses.h sys/dr.h \
- )
+ sys/systemcfg.h ncurses.h curses.h sys/dr.h sys/vfs.h \
+ pam/pam_appl.h security/pam_appl.h \
+ )
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
AC_HEADER_STDC
@@ -64,6 +65,10 @@ dnl Check if ptrace takes four or five arguments
dnl
X_AC_PTRACE
+dnl Check if setpgrp takes zero or two arguments
+drn
+X_AC_SETPGRP
+
dnl Check of sched_getaffinity exists and it's argument count
dnl
X_AC_AFFINITY
@@ -86,9 +91,12 @@ dnl
AC_FUNC_MALLOC
AC_FUNC_STRERROR_R
AC_CHECK_FUNCS( \
+ fdatasync \
hstrerror \
strerror \
mtrace \
+ strndup \
+ strlcpy \
strsignal \
inet_aton \
inet_ntop \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 83558274f05..9e333691797 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -138,6 +139,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 4650a21811b..9183f591b38 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/doc/html/news.shtml b/doc/html/news.shtml
index 4e2b7d1cadd..bc2a08287af 100644
--- a/doc/html/news.shtml
+++ b/doc/html/news.shtml
@@ -79,6 +79,7 @@ on a node.</li>
<li>Treat memory as a consumable resource on a compute node.</li>
<li>Perl API to SLURM.</li>
<li>Graphical User Interfaces provided.</li>
+<li>Added support for OS X.</li>
<li>Add Kerberos credential support including credential forwarding and refresh.</li>
<li>Permit batch jobs to be requeued.</li>
</ul>
@@ -94,6 +95,6 @@ to coordinate activies. Future development plans includes:
</ul>
-<p style="text-align:center;">Last modified 30 May 2006</p>
+<p style="text-align:center;">Last modified 9 June 2006</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/html/platforms.shtml b/doc/html/platforms.shtml
index 33d38d7b864..b8e0143a514 100644
--- a/doc/html/platforms.shtml
+++ b/doc/html/platforms.shtml
@@ -8,6 +8,7 @@
in version 0.4.</li>
<li><b>Linux</b>—SLURM has been thoroughly tested on Red Hat Linux using
i386, ia64, and x86_64 architectures.</li>
+<li><b>OS X</b>—SLURM support for OS X is available in version 1.2.</li>
<li><b>Other</b>—SLURM ports to other systems will be gratefully accepted.</li>
</ul>
<h2>Interconnects</h2>
@@ -24,6 +25,6 @@ are available in all versions of SLURM and have been thoroughly tested.</li>
<li><b>Other</b>—SLURM ports to other systems will be gratefully accepted.</li>
</ul>
-<p style="text-align:center;">Last modified 11 May 2006</p>
+<p style="text-align:center;">Last modified 9 June 2006</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 71863e52c14..66a33b7af73 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -137,6 +138,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/Makefile.in b/src/Makefile.in
index 2eda8b2bee7..1e3a9a0d9c6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -138,6 +139,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 55c3501cefa..12482532fd3 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -168,6 +169,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/api/pmi.c b/src/api/pmi.c
index 6d89b8c805f..c0dcf854f06 100644
--- a/src/api/pmi.c
+++ b/src/api/pmi.c
@@ -78,6 +78,7 @@
#include <slurm/slurm_errno.h>
#include "src/api/slurm_pmi.h"
+#include "src/common/macros.h"
#include "src/common/malloc.h"
#define KVS_STATE_LOCAL 0
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index d585ff5fd46..be1e9e010dc 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -202,6 +203,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/common/global_srun.c b/src/common/global_srun.c
index aa1b94b157f..568c8442f05 100644
--- a/src/common/global_srun.c
+++ b/src/common/global_srun.c
@@ -72,11 +72,11 @@ int message_thread = 0;
/*
* Static prototypes
*/
-static void _p_fwd_signal(slurm_msg_t *, srun_job_t *);
+static void _p_fwd_signal(slurm_msg_t *, srun_job_t *, int);
static void * _p_signal_task(void *);
void
-fwd_signal(srun_job_t *job, int signo)
+fwd_signal(srun_job_t *job, int signo, int max_threads)
{
int i;
slurm_msg_t *req;
@@ -122,7 +122,7 @@ fwd_signal(srun_job_t *job, int signo)
&job->slurmd_addr[i], sizeof(slurm_addr));
}
- _p_fwd_signal(req, job);
+ _p_fwd_signal(req, job, max_threads);
debug2("All tasks have been signalled");
xfree(req);
@@ -148,7 +148,7 @@ job_active_tasks_on_host(srun_job_t *job, int hostid)
}
/* _p_fwd_signal - parallel (multi-threaded) task signaller */
-static void _p_fwd_signal(slurm_msg_t *req, srun_job_t *job)
+static void _p_fwd_signal(slurm_msg_t *req, srun_job_t *job, int max_threads)
{
int i;
task_info_t *tinfo;
@@ -160,7 +160,7 @@ static void _p_fwd_signal(slurm_msg_t *req, srun_job_t *job)
continue; /* inactive task */
slurm_mutex_lock(&active_mutex);
- while (active >= opt.max_threads) {
+ while (active >= max_threads) {
pthread_cond_wait(&active_cond, &active_mutex);
}
active++;
diff --git a/src/common/global_srun.h b/src/common/global_srun.h
index 81ec9ac7641..e961b3b67f7 100644
--- a/src/common/global_srun.h
+++ b/src/common/global_srun.h
@@ -1,7 +1,7 @@
/*****************************************************************************\
- * src/common/global_srun.c - functions needed by more than just srun
+ * src/common/global_srun.c - functions needed by more than just srun
*****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
+ * Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grodnona <mgrondona@llnl.gov>.
* UCRL-CODE-217948.
@@ -29,7 +29,7 @@
#include "src/srun/srun_job.h"
-void fwd_signal(srun_job_t *job, int signal);
+void fwd_signal(srun_job_t *job, int signal, int max_threads);
int job_active_tasks_on_host(srun_job_t *job, int hostid);
#endif /* !_GLOBAL_SRUN_H */
diff --git a/src/common/macros.h b/src/common/macros.h
index 9ab36e781eb..bb15117eedb 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -245,4 +245,9 @@ typedef enum {false, true} bool;
# endif
#endif
+#ifndef HAVE_STRNDUP
+# undef strndup
+# define strndup(src,size) strdup(src)
+#endif
+
#endif /* !_MACROS_H */
diff --git a/src/common/plugstack.c b/src/common/plugstack.c
index 12ec1943269..6960f021dcd 100644
--- a/src/common/plugstack.c
+++ b/src/common/plugstack.c
@@ -312,7 +312,7 @@ _spank_stack_process_line(const char *file, int line, char *buf,
char **argv;
int ac;
char *path;
- bool required;
+ bool required = FALSE;
struct spank_plugin *p;
@@ -1016,7 +1016,7 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
}
break;
case S_TASK_GLOBAL_ID:
- p2uint32 = va_arg(vargs, int *);
+ p2uint32 = va_arg(vargs, uint32_t *);
if (!spank->task) {
rc = ESPANK_NOT_TASK;
} else {
diff --git a/src/common/strlcpy.c b/src/common/strlcpy.c
index e1751a70531..6a757ced7cb 100644
--- a/src/common/strlcpy.c
+++ b/src/common/strlcpy.c
@@ -27,6 +27,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+# if (!HAVE_STRLCPY)
+
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
@@ -76,3 +80,7 @@ strlcpy(dst, src, siz)
return(s - src - 1); /* count does not include NUL */
}
+
+# endif /* !HAVE_STRLCPY */
+#endif /* HAVE_CONFIG_H */
+
diff --git a/src/common/strlcpy.h b/src/common/strlcpy.h
index 8ad3be59886..5ed872b96a5 100644
--- a/src/common/strlcpy.h
+++ b/src/common/strlcpy.h
@@ -1,17 +1,20 @@
-
-#include <sys/types.h>
-
#ifndef _STRLCPY_H
#define _STRLCPY_H
-/*
- * Copy src to string dst of size siz. At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t siz);
+#if HAVE_CONFIG_H
+# include "config.h"
+# if (!HAVE_STRLCPY)
+# undef strlcpy
-#endif /* !_STRLCPY_H */
+# include <sys/types.h>
+ /*
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+ size_t strlcpy(char *dst, const char *src, size_t siz);
+# endif /* !HAVE_STRLCPY */
+#endif /* HAVE_CONFIG_H */
+#endif /* _STRLCPY_H */
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 0b91e16feeb..a8a25c93f4e 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -138,6 +139,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index 098cc0b72f7..5f38306e8d5 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index 5d304bd809d..b23e6fccf5b 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 28fe3062f9f..0336c9bf4e9 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -160,6 +161,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index b1f3c981932..918613cdd16 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 824df5d6901..a45d4476d60 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index 42b3196fbc3..ac7d2fff10b 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -163,6 +164,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index d1b14f3a613..3ec21d67089 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobacct/Makefile.in b/src/plugins/jobacct/Makefile.in
index 1031822cd84..82e1ee4b472 100644
--- a/src/plugins/jobacct/Makefile.in
+++ b/src/plugins/jobacct/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobacct/aix/Makefile.in b/src/plugins/jobacct/aix/Makefile.in
index 9d1cfbe31c9..65d87846420 100644
--- a/src/plugins/jobacct/aix/Makefile.in
+++ b/src/plugins/jobacct/aix/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobacct/common/common_slurmctld.c b/src/plugins/jobacct/common/common_slurmctld.c
index 9fc9de51154..78697de0713 100644
--- a/src/plugins/jobacct/common/common_slurmctld.c
+++ b/src/plugins/jobacct/common/common_slurmctld.c
@@ -26,6 +26,9 @@
* This file is patterned after jobcomp_linux.c, written by Morris Jette and
* Copyright (C) 2002 The Regents of the University of California.
\*****************************************************************************/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "jobacct_common.h"
@@ -115,7 +118,9 @@ static int _print_record(struct job_record *job_ptr,
job_ptr->user_id, job_ptr->group_id, block_id, data)
< 0)
rc=SLURM_ERROR;
+#ifdef HAVE_FDATSYNC
fdatasync(LOGFILE_FD);
+#endif
slurm_mutex_unlock( &logfile_lock );
xfree(block_id);
diff --git a/src/plugins/jobacct/linux/Makefile.in b/src/plugins/jobacct/linux/Makefile.in
index 841421ec3de..1e0a08cf087 100644
--- a/src/plugins/jobacct/linux/Makefile.in
+++ b/src/plugins/jobacct/linux/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobacct/none/Makefile.in b/src/plugins/jobacct/none/Makefile.in
index 621fcf127f7..5894c6641c2 100644
--- a/src/plugins/jobacct/none/Makefile.in
+++ b/src/plugins/jobacct/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index f3f6031773c..297c6ac7c99 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index f0dc621dd16..f4e216015d5 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index e602b290466..4658acb2ded 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 9d264c7bd05..39ebd095baf 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 771f4e78b7d..df0ba82fec7 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index ae584fe7847..a8a6de35d7b 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 9d05b0a258f..daf26eb0684 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index db43d8c209a..c0e2bb3d482 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -44,6 +44,7 @@
#include "src/common/xstring.h"
#include "src/common/net.h"
#include "src/common/global_srun.h"
+#include "src/srun/opt.h"
#include "src/plugins/mpi/mpichgm/mpichgm.h"
@@ -266,7 +267,7 @@ static void _gmpi_wait_abort(srun_job_t *job)
}
close(newfd);
debug("Received ABORT message from an MPI process.");
- fwd_signal(job, SIGKILL);
+ fwd_signal(job, SIGKILL, opt.max_threads);
#if 0
xfree(rbuf);
close(jgmpi_fd);
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 44527a7afd9..706aa24c493 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/mpi/mvapich/mvapich.c b/src/plugins/mpi/mvapich/mvapich.c
index d8c060b04a3..caaf4f91e76 100644
--- a/src/plugins/mpi/mvapich/mvapich.c
+++ b/src/plugins/mpi/mvapich/mvapich.c
@@ -44,6 +44,7 @@
#include "src/common/net.h"
#include "src/common/fd.h"
#include "src/common/global_srun.h"
+#include "src/srun/opt.h"
/* NOTE: MVAPICH has changed protocols without changing version numbers.
* This makes support of MVAPICH very difficult.
@@ -283,7 +284,7 @@ static void mvapich_wait_for_abort(srun_job_t *job)
info ("mvapich: Received ABORT message from MPI Rank %d", rank);
} else
info ("mvapich: Received ABORT message from an MPI process.");
- fwd_signal(job, SIGKILL);
+ fwd_signal(job, SIGKILL, opt.max_threads);
}
return; /* but not reached */
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 56858fc2e74..68a38649ad7 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index bd1f6c20275..13d210a43ca 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am 8320 2006-06-06 19:23:26Z grondo $
+# $Id: Makefile.am 8319 2006-06-06 19:09:16Z grondo $
# Makefile for proctrack plugins
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 0a23aeb23e3..0da7a3500a2 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index d4e63a58d76..a280dcbacf7 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index 36f626c39b7..47218e0e0c6 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index deefe3d7238..b79b0017406 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index cfdcc9871f1..1ab0b02adc4 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index 14b5809aa4a..b5b9131db9e 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index b8b16aba7cd..a4554fdd79a 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index b814ddded21..497a32dbd13 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index ce00febab00..d9e1a351dd0 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/maui/Makefile.in b/src/plugins/sched/maui/Makefile.in
index 68dc3dc1107..aa58cce0854 100644
--- a/src/plugins/sched/maui/Makefile.in
+++ b/src/plugins/sched/maui/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/sched/maui/wiki/Makefile.in b/src/plugins/sched/maui/wiki/Makefile.in
index e73e7f9a9ed..1fe4d0a190c 100644
--- a/src/plugins/sched/maui/wiki/Makefile.in
+++ b/src/plugins/sched/maui/wiki/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -191,6 +192,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index 0a4e7a94a2f..3d31225ab91 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 19ac40aec12..4935b138547 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 1c7951640c8..951eb8e5b76 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -150,6 +151,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index d1c03d6c4dc..33de128f5ad 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -180,6 +181,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index 8c4850dd00a..9fcf7562c8a 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 4196f0ff538..4521dcd902a 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index be881b4ba25..8d023df2e51 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 1a680a4d043..a1ee635e3c3 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -164,6 +165,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 118a1c57e4b..75832085c51 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -168,6 +169,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/switch/federation/switch_federation.c b/src/plugins/switch/federation/switch_federation.c
index d2fe0ca46eb..e07bf130512 100644
--- a/src/plugins/switch/federation/switch_federation.c
+++ b/src/plugins/switch/federation/switch_federation.c
@@ -38,6 +38,7 @@
#include <stdlib.h>
#include <slurm/slurm_errno.h>
+#include "src/common/macros.h"
#include "src/common/slurm_xlator.h"
#include "src/plugins/switch/federation/federation.h"
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index 045d564e148..3db89abe474 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index a3ed4493720..b711b8660ff 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -139,6 +140,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index c86065e0a27..5a26b381a06 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -168,6 +169,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index 2a94117a891..9f1a5249190 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 0f3c0e7f93f..7582ca74ac9 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index 829f54e3fae..2160de27b3d 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -158,6 +159,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/sbcast/opts.c b/src/sbcast/opts.c
index 88d02406da6..b4dff24d6c0 100644
--- a/src/sbcast/opts.c
+++ b/src/sbcast/opts.c
@@ -38,6 +38,7 @@
# include "src/common/getopt.h"
#endif
+#include <limits.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/sbcast/sbcast.c b/src/sbcast/sbcast.c
index cb39c5d5750..0c0b813a99e 100644
--- a/src/sbcast/sbcast.c
+++ b/src/sbcast/sbcast.c
@@ -174,8 +174,7 @@ static void _bcast_file(void)
/* NOTE: packmem() uses 16 bits to express a block size,
* buf_size must be no larger than 64k - 1 */
- buf_size = MIN(SSIZE_MAX, (63 * 1024));
- buf_size = MIN(buf_size, f_stat.st_size);
+ buf_size = MIN((63 * 1024), f_stat.st_size);
bcast_msg.fname = params.dst_fname;
bcast_msg.block_no = 1;
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index d87f555a147..ef5a85e0991 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -157,6 +158,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index 4967ec4bbc2..94781c6f43d 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -65,7 +65,7 @@
struct signv {
char *name;
uint16_t val;
-} sys_signame[ ] = {
+} sig_name_num[ ] = {
{ "HUP", SIGHUP },
{ "INT", SIGINT },
{ "QUIT", SIGQUIT },
@@ -178,16 +178,16 @@ static uint16_t _xlate_signal_name(const char *signal_name)
if ((*end_ptr == '\0') || (sig_num != 0))
return sig_num;
- for (i=0; i<SIZE(sys_signame); i++) {
- if (strcasecmp(sys_signame[i].name, signal_name) == 0) {
+ for (i=0; i<SIZE(sig_name_num); i++) {
+ if (strcasecmp(sig_name_num[i].name, signal_name) == 0) {
xfree(sig_names);
- return sys_signame[i].val;
+ return sig_name_num[i].val;
}
if (i == 0)
- sig_names = xstrdup(sys_signame[i].name);
+ sig_names = xstrdup(sig_name_num[i].name);
else {
xstrcat(sig_names, ",");
- xstrcat(sig_names, sys_signame[i].name);
+ xstrcat(sig_names, sig_name_num[i].name);
}
}
fprintf (stderr, "Invalid job signal: %s\n", signal_name);
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index 6d39631344a..bbb02078432 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -156,6 +157,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index ab91cb7a243..0554fabf5f2 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -159,6 +160,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index 32cea24a57a..53d4a086682 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -161,6 +162,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index fc7c0c13b45..df2b904659e 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1658,7 +1658,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg)
/* init */
int error_code = SLURM_SUCCESS;
DEF_TIMERS;
- uint32_t step_id;
+ uint32_t step_id = 0;
struct job_record *job_ptr;
slurm_msg_t response_msg;
submit_response_msg_t submit_msg;
diff --git a/src/slurmctld/sched_plugin.c b/src/slurmctld/sched_plugin.c
index 6ddb8c1bde1..beb7ff12247 100644
--- a/src/slurmctld/sched_plugin.c
+++ b/src/slurmctld/sched_plugin.c
@@ -40,7 +40,7 @@
/* ************************************************************************ */
typedef struct slurm_sched_ops {
int (*schedule) ( void );
- u_int32_t (*initial_priority) ( u_int32_t );
+ uint32_t (*initial_priority) ( uint32_t );
void (*job_is_pending) ( void );
int (*get_errno) ( void );
char * (*strerror) ( int );
@@ -235,8 +235,8 @@ slurm_sched_schedule( void )
/* *********************************************************************** */
/* TAG( slurm_sched_initital_priority ) */
/* *********************************************************************** */
-u_int32_t
-slurm_sched_initial_priority( u_int32_t max_prio )
+uint32_t
+slurm_sched_initial_priority( uint32_t max_prio )
{
if ( slurm_sched_init() < 0 )
return SLURM_ERROR;
diff --git a/src/slurmctld/sched_plugin.h b/src/slurmctld/sched_plugin.h
index 743e3e18fe0..11ed48b3dd0 100644
--- a/src/slurmctld/sched_plugin.h
+++ b/src/slurmctld/sched_plugin.h
@@ -57,7 +57,7 @@ int slurm_sched_schedule( void );
/*
* Supply the initial SLURM priority for a newly-submitted job.
*/
-u_int32_t slurm_sched_initial_priority( u_int32_t max_prio );
+uint32_t slurm_sched_initial_priority( uint32_t max_prio );
/*
* Note that some job is pending.
@@ -87,7 +87,7 @@ char *slurm_sched_p_strerror( int errnum );
* scheduler requests. The interpretation of this value depends on
* the scheduler type. The value is returned in host byte order.
*/
-u_int16_t sched_get_port( void );
+uint16_t sched_get_port( void );
/*
* Returns the authentication credentials.
@@ -112,7 +112,7 @@ const char * sched_get_auth( void );
* Returns non-zero if RootOnly partitions are to be filtered from
* any external scheduling efforts.
*/
-u_int16_t sched_get_root_filter( void );
+uint16_t sched_get_root_filter( void );
/*
* Opaque type for a list of objects supplied by the controller.
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index 9508c03e654..f271e77fa18 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -138,6 +139,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/slurmd/common/run_script.c b/src/slurmd/common/run_script.c
index 13408947847..bc28b44af49 100644
--- a/src/slurmd/common/run_script.c
+++ b/src/slurmd/common/run_script.c
@@ -24,6 +24,10 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
\*****************************************************************************/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
#include <sys/wait.h>
#include <sys/errno.h>
@@ -77,7 +81,11 @@ run_script(const char *name, const char *path, uint32_t jobid, uid_t uid,
if (strncmp(name, "user", 4) == 0)
setuid(uid);
+#ifdef SETPGRP_TWO_ARGS
+ setpgrp(0, 0);
+#else
setpgrp();
+#endif
execve(path, argv, env);
error("execve(): %m");
exit(127);
diff --git a/src/slurmd/common/stepd_api.c b/src/slurmd/common/stepd_api.c
index 1d1d53ffd4a..c412f0feab6 100644
--- a/src/slurmd/common/stepd_api.c
+++ b/src/slurmd/common/stepd_api.c
@@ -40,6 +40,7 @@
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
+#include "src/common/macros.h"
#include "src/common/pack.h"
#include "src/common/slurm_auth.h"
#include "src/common/slurm_cred.h"
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index 57b32680342..44cdeb303cc 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -169,6 +170,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/slurmd/slurmd/get_mach_stat.c b/src/slurmd/slurmd/get_mach_stat.c
index 83a5ac1ec98..782d3177c0b 100644
--- a/src/slurmd/slurmd/get_mach_stat.c
+++ b/src/slurmd/slurmd/get_mach_stat.c
@@ -6,7 +6,7 @@
* OS name and CPU speed. See code ifdef'ed out via USE_OS_NAME and
* USE_CPU_SPEED
*****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
+ * Copyright (C) 2002-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.
@@ -48,7 +48,9 @@
#include <string.h>
#include <syslog.h>
#include <sys/utsname.h>
-#include <sys/vfs.h>
+#ifdef HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
#include <unistd.h>
#include "src/common/hostlist.h"
@@ -105,8 +107,9 @@ get_procs(uint32_t *procs)
}
*procs = (uint32_t)info.online_vcpus;
- return 0;
-#else
+#else /* !LPAR_INFO_FORMAT2 */
+
+# ifdef _SC_NPROCESSORS_ONLN
int my_proc_tally;
*procs = 1;
@@ -117,8 +120,12 @@ get_procs(uint32_t *procs)
}
*procs = my_proc_tally;
+# else
+ *procs = 1;
+# endif /* _SC_NPROCESSORS_ONLN */
+#endif /* LPAR_INFO_FORMAT2 */
+
return 0;
-#endif
}
@@ -184,6 +191,7 @@ get_mach_name(char *node_name)
extern int
get_memory(uint32_t *real_memory)
{
+#ifdef _SC_PHYS_PAGES
long pages;
*real_memory = 1;
@@ -195,15 +203,19 @@ get_memory(uint32_t *real_memory)
*real_memory = _system_configuration.physmem / (1024 * 1024);
return 0;
}
-#endif
+#endif /* HAVE__SYSTEM_CONFIGURATION */
if (pages < 1) {
error ("get_memory: error running sysconf(_SC_PHYS_PAGES)\n");
return EINVAL;
}
- *real_memory = (int)((float)pages * (sysconf(_SC_PAGE_SIZE) /
+ *real_memory = (uint32_t)((float)pages * (sysconf(_SC_PAGE_SIZE) /
1048576.0)); /* Megabytes of memory */
+#else /* !_SC_PHYS_PAGES */
+ *real_memory = 1;
+#endif /* _SC_PHYS_PAGES */
+
return 0;
}
@@ -258,13 +270,13 @@ get_speed(float *speed)
extern int
get_tmp_disk(uint32_t *tmp_disk, char *tmp_fs)
{
+ int error_code = 0;
+#ifdef HAVE_SYS_VFS
struct statfs stat_buf;
long total_size;
- int error_code;
float page_size;
char *tmp_fs_name = tmp_fs;
- error_code = 0;
*tmp_disk = 0;
total_size = 0;
page_size = (sysconf(_SC_PAGE_SIZE) / 1048576.0); /* MG per page */
@@ -280,6 +292,9 @@ get_tmp_disk(uint32_t *tmp_disk, char *tmp_fs)
errno, tmp_fs_name);
}
- *tmp_disk += (long)(total_size * page_size);
+ *tmp_disk += (uint32_t)(total_size * page_size);
+#else
+ *tmp_disk = 1;
+#endif
return error_code;
}
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index 1cc94e97260..33a9bf0ce5f 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -165,6 +166,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index c3f0c2a766d..d27c7d9e35a 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -616,7 +616,7 @@ static void
_send_step_complete_msgs(slurmd_job_t *job)
{
int start, size;
- int first, last;
+ int first = 0, last = 0;
bool sent_own_comp_msg = false;
pthread_mutex_lock(&step_complete.lock);
diff --git a/src/slurmd/slurmstepd/pam_ses.c b/src/slurmd/slurmstepd/pam_ses.c
index 8690c70d7f6..ac50fb47147 100644
--- a/src/slurmd/slurmstepd/pam_ses.c
+++ b/src/slurmd/slurmstepd/pam_ses.c
@@ -36,8 +36,13 @@
#ifdef HAVE_PAM
-#include <security/pam_appl.h>
-#include <security/pam_misc.h>
+#ifdef HAVE_PAM_PAM_APPL_H
+# include <pam/pam_appl.h>
+# include <pam/pam_misc.h>
+#else
+# include <security/pam_appl.h>
+# include <security/pam_misc.h>
+#endif
static pam_handle_t *pam_h = NULL;
diff --git a/src/slurmd/slurmstepd/pdebug.c b/src/slurmd/slurmstepd/pdebug.c
index 1cc7b73ba2d..03675a9fe00 100644
--- a/src/slurmd/slurmstepd/pdebug.c
+++ b/src/slurmd/slurmstepd/pdebug.c
@@ -73,7 +73,7 @@ pdebug_trace_process(slurmd_job_t *job, pid_t pid)
return SLURM_ERROR;
}
-#ifdef HAVE_AIX
+#ifdef PT_DETACH
if (_PTRACE(PT_DETACH, pid, NULL, 0)) {
#else
if (_PTRACE(PTRACE_DETACH, pid, NULL, 0)) {
@@ -95,7 +95,7 @@ pdebug_stop_current(slurmd_job_t *job)
* Stop the task on exec for TotalView to connect
*/
if ( (job->task_flags & TASK_PARALLEL_DEBUG)
-#ifdef HAVE_AIX
+#ifdef PT_TRACE_ME
&& (_PTRACE(PT_TRACE_ME, 0, NULL, 0) < 0) )
#else
&& (_PTRACE(PTRACE_TRACEME, 0, NULL, 0) < 0) )
diff --git a/src/slurmd/slurmstepd/pdebug.h b/src/slurmd/slurmstepd/pdebug.h
index ab6a2c4945a..72bfcaf7e89 100644
--- a/src/slurmd/slurmstepd/pdebug.h
+++ b/src/slurmd/slurmstepd/pdebug.h
@@ -26,6 +26,7 @@
#ifndef _PDEBUG_H
#define _PDEBUG_H
+#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index 8b62765fbf3..6a3dbb97cc8 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -191,7 +191,11 @@ _run_script(const char *name, const char *path, slurmd_job_t *job)
dup(pfd[1]);
close(2);
close(0);
+#ifdef SETPGRP_TWO_ARGS
+ setpgrp(0, 0);
+#else
setpgrp();
+#endif
execve(path, argv, job->env);
error("execve(): %m");
exit(127);
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index aef51a6368b..8029e8e3d9b 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -170,6 +171,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index 5ec10a012bb..48d10e23d8b 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -160,6 +161,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am
index 9b55825e83b..2f3f16a5971 100644
--- a/src/srun/Makefile.am
+++ b/src/srun/Makefile.am
@@ -55,6 +55,6 @@ install-exec-local:
srcdir=`cd $(top_srcdir) && pwd`; \
/usr/lib/rpm/debugedit -b $$srcdir -d $(pkglibdir) \
$(DESTDIR)$(bindir)/srun; fi; \
- $(INSTALL) -D -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
+ $(INSTALL) $(INSTALL_DIRS) -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
$(DESTDIR)$(pkglibdir)/src/srun/srun.wrapper.c
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index cde3ae751b2..b4808265f0d 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -161,6 +162,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -608,7 +610,7 @@ install-exec-local:
srcdir=`cd $(top_srcdir) && pwd`; \
/usr/lib/rpm/debugedit -b $$srcdir -d $(pkglibdir) \
$(DESTDIR)$(bindir)/srun; fi; \
- $(INSTALL) -D -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
+ $(INSTALL) $(INSTALL_DIRS) -m 644 $(top_srcdir)/src/srun/srun.wrapper.c \
$(DESTDIR)$(pkglibdir)/src/srun/srun.wrapper.c
# 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.
diff --git a/src/srun/fname.c b/src/srun/fname.c
index 3013616a2a9..1a8346b17cf 100644
--- a/src/srun/fname.c
+++ b/src/srun/fname.c
@@ -35,6 +35,7 @@
#include <ctype.h>
#include "src/srun/fname.h"
+#include "src/srun/opt.h"
#include "src/srun/srun_job.h"
#include "src/common/xmalloc.h"
diff --git a/src/srun/fname.h b/src/srun/fname.h
index 80923469c51..a951bf819b3 100644
--- a/src/srun/fname.h
+++ b/src/srun/fname.h
@@ -31,7 +31,15 @@
# include "config.h"
#endif
-#include "src/srun/opt.h"
+enum io_t {
+ IO_ALL = 0, /* multiplex output from all/bcast stdin to all */
+ IO_ONE = 1, /* output from only one task/stdin to one task */
+ IO_PER_TASK = 2, /* separate output/input file per task */
+ IO_NONE = 3, /* close output/close stdin */
+};
+
+#define format_io_t(t) (t == IO_ONE) ? "one" : (t == IO_ALL) ? \
+ "all" : "per task"
typedef struct io_filename {
char *name;
diff --git a/src/srun/msg.c b/src/srun/msg.c
index 75f1d390cfc..5adb15fc686 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -352,7 +352,7 @@ static void _node_fail_handler(char *nodelist, srun_job_t *job)
error("Node failure on %s, killing job", nodelist);
update_job_state(job, SRUN_JOB_FORCETERM);
info("sending Ctrl-C to remaining tasks");
- fwd_signal(job, SIGINT);
+ fwd_signal(job, SIGINT, opt.max_threads);
}
static bool _job_msg_done(srun_job_t *job)
@@ -552,7 +552,7 @@ _confirm_launch_complete(srun_job_t *job)
error ("Node %s not responding, terminating job step",
job->step_layout->host[i]);
info("sending Ctrl-C to remaining tasks");
- fwd_signal(job, SIGINT);
+ fwd_signal(job, SIGINT, opt.max_threads);
job->rc = 124;
update_job_state(job, SRUN_JOB_FAILED);
pthread_exit(0);
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 23f5c3c10c2..64b7d794d9b 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -126,6 +126,13 @@
#define LONG_OPT_MULTI 0x122
#define LONG_OPT_NO_REQUEUE 0x123
+/*---- global variables, defined in opt.h ----*/
+char **remote_argv;
+int remote_argc;
+int _verbose;
+enum modes mode;
+opt_t opt;
+
/*---- forward declarations of static functions ----*/
typedef struct env_vars env_vars_t;
diff --git a/src/srun/opt.h b/src/srun/opt.h
index 0c9760ff88f..a57181bd53c 100644
--- a/src/srun/opt.h
+++ b/src/srun/opt.h
@@ -46,9 +46,9 @@
/* global variables relating to user options */
-char **remote_argv;
-int remote_argc;
-int _verbose;
+extern char **remote_argv;
+extern int remote_argc;
+extern int _verbose;
/* mutually exclusive modes for srun */
enum modes {
@@ -60,24 +60,13 @@ enum modes {
MODE_BATCH = 5
};
-enum modes mode;
+extern enum modes mode;
#define format_task_dist_states(t) (t == SLURM_DIST_BLOCK) ? "block" : \
(t == SLURM_DIST_CYCLIC) ? "cyclic" : \
(t == SLURM_DIST_ARBITRARY) ? "arbitrary" : \
"unknown"
-enum io_t {
- IO_ALL = 0, /* multiplex output from all/bcast stdin to all */
- IO_ONE = 1, /* output from only one task/stdin to one task */
- IO_PER_TASK = 2, /* separate output/input file per task */
- IO_NONE = 3, /* close output/close stdin */
-};
-
-#define format_io_t(t) (t == IO_ONE) ? "one" : (t == IO_ALL) ? \
- "all" : "per task"
-//typedef struct srun_job fname_job_t;
-
typedef struct srun_options {
char *progname; /* argv[0] of this program or
@@ -178,7 +167,7 @@ typedef struct srun_options {
char *ctrl_comm_ifhn; /* --ctrl-comm-ifhn */
} opt_t;
-opt_t opt;
+extern opt_t opt;
/* return whether any constraints were specified by the user
* (if new constraints are added above, might want to add them to this
diff --git a/src/srun/signals.c b/src/srun/signals.c
index c9a973eee60..0b71eebdca8 100644
--- a/src/srun/signals.c
+++ b/src/srun/signals.c
@@ -1,7 +1,7 @@
/*****************************************************************************\
- * src/srun/signals.c - signal handling for srun
+ * src/srun/signals.c - signal handling for srun
*****************************************************************************
- * Copyright (C) 2002 The Regents of the University of California.
+ * Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>, and
* Morris Jette <jette1@llnl.gov>
@@ -46,6 +46,7 @@
#include "src/common/xsignal.h"
#include "src/common/global_srun.h"
+#include "src/srun/opt.h"
#include "src/srun/srun_job.h"
#define MAX_RETRIES 3
@@ -153,7 +154,7 @@ _handle_intr(srun_job_t *job, time_t *last_intr, time_t *last_intr_sent)
info("sending Ctrl-C to job");
*last_intr_sent = time(NULL);
- fwd_signal(job, SIGINT);
+ fwd_signal(job, SIGINT, opt.max_threads);
} else {
job_force_termination(job);
@@ -197,7 +198,7 @@ _sig_thr(void *arg)
job_force_termination(job);
break;
default:
- fwd_signal(job, signo);
+ fwd_signal(job, signo, opt.max_threads);
break;
}
}
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 521b202dfb6..785ebe6ecec 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -936,9 +936,7 @@ static int _run_job_script (srun_job_t *job, env_t *env)
exitcode = _print_script_exit_status(xbasename(argv[0]), status);
- if (unsetenv("SLURM_JOBID")) {
- error("Unable to clear SLURM_JOBID environment variable");
- }
+ (void) unsetenv("SLURM_JOBID"); /* no return code on some systems */
return exitcode;
}
diff --git a/src/srun/srun_job.c b/src/srun/srun_job.c
index d727190952e..15254a62a19 100644
--- a/src/srun/srun_job.c
+++ b/src/srun/srun_job.c
@@ -373,7 +373,7 @@ srun_job_destroy(srun_job_t *job, int error)
slurm_complete_job(job->jobid, error);
} else {
debug("no allocation to cancel, killing remote tasks");
- fwd_signal(job, SIGKILL);
+ fwd_signal(job, SIGKILL, opt.max_threads);
return;
}
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 9949358100e..6d0acfcca0a 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -145,6 +146,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 90f64b6e239..5e8fc4f6635 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -54,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -129,6 +130,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 56fa10ff808..9129b076993 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -136,6 +137,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index ffa4b60649c..c9973892271 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -156,6 +157,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index b7edd56e14f..9715faa65d2 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -187,6 +188,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index 562cfcceef6..b57fd142fa0 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -199,6 +200,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index a8a428519a0..98b12a9aaf9 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -129,6 +130,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 5f523ec2c86..355e0d26085 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.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_setpgrp.m4 \
$(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
$(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
$(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
@@ -129,6 +130,7 @@ 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_DIRS = @INSTALL_DIRS@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--
GitLab