- Further patches for support on NetBSD (and DragonFly) by
Aleksej Saushev. Dont use bash or bashism in shell scripts We should use Posix' setpgid(0,0), which is equivalent to setpgrp(). This commit was SVN r22829.
Этот коммит содержится в:
родитель
bb314911b3
Коммит
814fb9399f
@ -46,7 +46,7 @@ Set \`CXX_FOR_BUILD' to the C++ compiler of build system.])
|
||||
AS_IF([test x"$CC_FOR_BUILD" = x -a x"$CXX_FOR_BUILD" = x],
|
||||
[
|
||||
AC_MSG_NOTICE([no C/C++ compiler command for build system given
|
||||
In cross compile mode, it's recommended to build the compiler wrappers and OPARI for the build system. Set \`CC_FOR_BUILD' and `CXX_FOR_BUILD' to the C/C++ compiler of build system.])
|
||||
In cross compile mode, it's recommended to build the compiler wrappers and OPARI for the build system. Set \`CC_FOR_BUILD' and \`CXX_FOR_BUILD' to the C/C++ compiler of build system.])
|
||||
CC_FOR_BUILD=$CC
|
||||
CXX_FOR_BUILD=$CXX
|
||||
])
|
||||
|
@ -265,7 +265,8 @@ static void show_stackframe (int signo, siginfo_t * info, void * p)
|
||||
#ifdef SI_KERNEL
|
||||
case SI_KERNEL: si_code_str = "Kernel signal"; break;
|
||||
#endif
|
||||
#ifdef SI_UNDEFINED
|
||||
/* Dragonfly defines SI_USER and SI_UNDEFINED both as zero: */
|
||||
#if defined(SI_UNDEFINED) && (SI_UNDEFINED != SI_USER)
|
||||
case SI_UNDEFINED: si_code_str = "Undefined code"; break;
|
||||
#endif
|
||||
}
|
||||
|
@ -298,11 +298,7 @@ static int odls_default_fork_local_proc(orte_app_context_t* context,
|
||||
/* Set a new process group for this child, so that a
|
||||
SIGSTOP can be sent to it without being sent to the
|
||||
orted. */
|
||||
#if defined(__NetBSD__)
|
||||
setpgrp(0, 0);
|
||||
#else
|
||||
setpgrp();
|
||||
#endif
|
||||
setpgid(0, 0);
|
||||
}
|
||||
|
||||
/* Setup the pipe to be close-on-exec */
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
# The purpose of this shell script is to extract the ALPS resId for the
|
||||
# current batch job (under which we are running). Ideally, we would not
|
||||
# relegate such a function to a script; rather, we would extract this
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
# Otherwise, parse it from the PBS/Torque environmental variable.
|
||||
jid=${PBS_JOBID:--1}
|
||||
if [ $jid == "-1" ]
|
||||
if [ $jid = "-1" ]
|
||||
then
|
||||
${ECHO} -1
|
||||
exit 0
|
||||
@ -41,7 +41,7 @@
|
||||
# file; but let's not be too hasty about reporting failure.
|
||||
resId=""
|
||||
count=0
|
||||
while ( [ "$resId" == "" ] )
|
||||
while [ "$resId" = "" ]
|
||||
do
|
||||
|
||||
# We're in a while loop, so skip the delay on the first trip.
|
||||
@ -63,7 +63,7 @@
|
||||
|
||||
# If we still don't have it after 10 attempts, then, I reckon that it
|
||||
# just wasn't meant to be.
|
||||
if [ "$resId" == "" ]
|
||||
if [ "$resId" = "" ]
|
||||
then
|
||||
${ECHO} 2
|
||||
exit 0
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2009 Los Alamos National Security, LLC. All rights reserved
|
||||
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
@ -13,10 +13,10 @@ fi
|
||||
var=$1
|
||||
|
||||
# if the var is CLEANUP, then we are in cleanup mode
|
||||
if [ "${var}" == "CLEANUP" ]; then
|
||||
if [ "${var}" = "CLEANUP" ]; then
|
||||
shift 1
|
||||
var=$1
|
||||
if [ -n "${var}" ] && [ "${var}" == "APPS" ]; then
|
||||
if [ -n "${var}" ] && [ "${var}" = "APPS" ]; then
|
||||
# kill specified apps
|
||||
shift 1
|
||||
var=$1
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user