arif/maui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added fixes submitted by Ake Sandgren

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@69 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
josh 2006-10-20 20:32:05 +00:00
parent 4ab5e6f67c
commit 84d58a74bd
7 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@ -2217,40 +2217,40 @@ OS=`uname`
if test "$OS" = "AIX"; then
if test `uname -v` = 4; then
if test `uname -r` = 1; then
OPSYS="AIX41"
OPSYS="__AIX41"
elif test `uname -r` = 2; then
OPSYS="AIX42"
OPSYS="__AIX42"
elif test `uname -r` = 3; then
OPSYS="AIX43"
OPSYS="__AIX43"
else
OPSYS="AIX43"
OPSYS="__AIX43"
RELEASE=`uname -r`
{ echo "$as_me:$LINENO: WARNING: Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS" >&2;}
fi
else
OPSYS=AIX43
OPSYS=__AIX43
OSLEVEL=`oslevel`
{ echo "$as_me:$LINENO: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&2;}
fi
elif test "$OS" = "Linux"; then
OPSYS="LINUX"
OPSYS="__LINUX"
elif test "$OS" = "HP-UX"; then
OPSYS="HPUX"
OPSYS="__HPUX"
elif test "$OS" = "HP-UX"; then
OPSYS="HPUX"
OPSYS="__HPUX"
elif test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
OPSYS="IRIX"
OPSYS="__IRIX"
OS="IRIX"
elif test "$OS" = "NT"; then
OPSYS="NT"
OPSYS="__NT"
OS="NT"
elif test "$OS" = "OSF1"; then
OPSYS="OSF"
OPSYS="__OSF"
OS="OSF"
else
OPSYS="LINUX"
OPSYS="__LINUX"
{ echo "$as_me:$LINENO: WARNING: Unsupported OS: $OS, attempting build with OPSYS=$OPSYS" >&5
echo "$as_me: WARNING: Unsupported OS: $OS, attempting build with OPSYS=$OPSYS" >&2;}
OS="LINUX"

24
configure.ac
View File

@ -38,38 +38,38 @@ OS=`uname`
if test "$OS" = "AIX"; then
if test `uname -v` = 4; then
if test `uname -r` = 1; then
OPSYS="AIX41"
OPSYS="__AIX41"
elif test `uname -r` = 2; then
OPSYS="AIX42"
OPSYS="__AIX42"
elif test `uname -r` = 3; then
OPSYS="AIX43"
OPSYS="__AIX43"
else
OPSYS="AIX43"
OPSYS="__AIX43"
RELEASE=`uname -r`
AC_MSG_WARN([Unexpected OS release 'AIX4$RELEASE', attempting build with OPSYS=$OPSYS])
fi
else
OPSYS=AIX43
OPSYS=__AIX43
OSLEVEL=`oslevel`
AC_MSG_WARN([Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS])
fi
elif test "$OS" = "Linux"; then
OPSYS="LINUX"
OPSYS="__LINUX"
elif test "$OS" = "HP-UX"; then
OPSYS="HPUX"
OPSYS="__HPUX"
elif test "$OS" = "HP-UX"; then
OPSYS="HPUX"
OPSYS="__HPUX"
elif test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
OPSYS="IRIX"
OPSYS="__IRIX"
OS="IRIX"
elif test "$OS" = "NT"; then
OPSYS="NT"
OPSYS="__NT"
OS="NT"
elif test "$OS" = "OSF1"; then
OPSYS="OSF"
OPSYS="__OSF"
OS="OSF"
else
OPSYS="LINUX"
OPSYS="__LINUX"
AC_MSG_WARN([Unsupported OS: $OS, attempting build with OPSYS=$OPSYS])
OS="LINUX"
fi

1
src/moab/MConfig.c
View File

@ -1563,6 +1563,7 @@ int MCfgSetVal(
case mcoJobFBAction:
case mcoMailAction:
case pAdminEAction:
case pAdminEInterval:
case pCheckPointFile:
case pCheckPointInterval:
case pCheckPointExpirationTime:

14
src/moab/MPBSI.c
View File

@ -661,7 +661,7 @@ int MPBSWorkloadQuery(
if (MJobFind(SJID,&J,0) == SUCCESS)
{
if (IsExiting == TRUE)
IsExiting |= (1 << mjfIsExiting);
J->Flags |= (1 << mjfIsExiting);
MRMJobPreUpdate(J);
@ -674,7 +674,7 @@ int MPBSWorkloadQuery(
/* if new job, load data */
if (IsExiting == TRUE)
IsExiting |= (1 << mjfIsExiting);
J->Flags |= (1 << mjfIsExiting);
MRMJobPreLoad(J,SJID,R->Index);
@ -710,7 +710,7 @@ int MPBSWorkloadQuery(
if (MJobFind(SJID,&J,0) == SUCCESS)
{
if (IsExiting == TRUE)
IsExiting |= (1 << mjfIsExiting);
J->Flags |= (1 << mjfIsExiting);
/* if job never ran, remove record. job cancelled externally */
@ -1796,7 +1796,7 @@ int MPBSJobStart(
J,
R,
ATTR_l,
(char *)(R->Version >= 710) ? "select" : "neednodes",
(char *)(R->Version >= 710 ? "select" : "neednodes"),
HostList,
NULL,
NULL) == FAILURE)
@ -1934,7 +1934,7 @@ int MPBSJobStart(
J,
R,
ATTR_l,
(char *)(R->Version >= 710) ? "select" : "neednodes",
(char *)(R->Version >= 710 ? "select" : "neednodes"),
J->NeedNodes,
NULL,
NULL) == FAILURE)
@ -4489,7 +4489,7 @@ int MPBSJobRequeue(
J,
R,
ATTR_l,
(char *)(R->Version >= 710) ? "select" : "neednodes",
(char *)(R->Version >= 710 ? "select" : "neednodes"),
J->NeedNodes,
NULL,
NULL) == FAILURE)
@ -4928,7 +4928,7 @@ int MPBSJobMigrate(
J,
R,
"Resource_List",
(char *)(R->Version >= 710) ? "select" : "neednodes",
(char *)(R->Version >= 710 ? "select" : "neednodes"),
tmpHList,
EMsg,
SC) == FAILURE)

2
src/server/Makefile
View File

@ -87,6 +87,8 @@ setup:
.c.o: $(INCS)
$(CC) $(IP) $(DEFS) $(CFLAGS) $(SOURCE) -c $<
UserI.o: OUserI.c
$(SERVER): $(SOBJECTS)
$(LD) $(SOBJECTS) -o $(BIN)/$@ $(LIBS) $(OSLDFLAGS) $(LP)
chmod 711 $(BIN)/$@ || true

10
src/server/OServer.c
View File

@ -5,7 +5,7 @@ int ServerSetSignalHandlers()
{
/* trap TERM(15) QUIT(3) INT(2) HUP(1) */
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD) || defined(LINUX)
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
signal(SIGINT, SIG_IGN);
signal(SIGTERM, (void(*)(int))MSysShutdown);
@ -120,7 +120,7 @@ int ServerSetSignalHandlers()
}
} /* END BLOCK */
#elif defined(__LINUX) || defined(__IRIX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF) || defined(LINUX)
#elif defined(__LINUX) || defined(__IRIX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF)
ServerLoadSignalConfig();
@ -279,7 +279,7 @@ int CrashMode(
if (signo == SIGSEGV)
{
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD) || defined(LINUX)
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
signal(SIGSEGV,(void(*)(int))CrashMode);
@ -291,7 +291,7 @@ int CrashMode(
}
else if (signo == SIGILL)
{
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD) || defined(LINUX)
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
signal(SIGILL,(void(*)(int))CrashMode);
@ -352,7 +352,7 @@ int ReloadConfig(
MSched.Reload = TRUE;
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD) || defined(LINUX)
#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
signal(SIGHUP,(void(*)(int))ReloadConfig);

6
src/server/OUserI.c
View File

@ -424,6 +424,7 @@ int UIProcessCommand(
MCKeyword[mckArgs]);
HeadSize = (int)strlen(SBuffer);
S->SBufSize -= HeadSize + 1;
if (Function[sindex] != NULL)
scode = (*Function[sindex])(args,S->SBuffer + HeadSize,FLAGS,Auth,&S->SBufSize);
@ -434,10 +435,7 @@ int UIProcessCommand(
*ptr = scode + '0';
if (S->SBufSize != sizeof(SBuffer))
S->SBufSize += (long)HeadSize;
else
S->SBufSize = (long)strlen(S->SBuffer);
S->SBufSize = (long)strlen(S->SBuffer);
MSUSendData(S,MAX_SOCKETWAIT,TRUE,TRUE);