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

sync

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@27 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
dev 2005-09-03 17:11:19 +00:00
parent 3f10d4eeab
commit b84261c49f
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/msched-version.h
View File

@ -1 +1 @@
#define MSCHED_VERSION "maui-3.2.6p14-snap.1125586736"
#define MSCHED_VERSION "maui-3.2.6p14-snap.1125680408"

23
src/moab/MPBSI.c
View File

@ -2304,9 +2304,10 @@ int MPBSNodeLoad(
N->CRes.Swap = MAX(MIN_SWAP,N->CRes.Mem);
}
/* PBS does not provide pool, opsys, machine speed, or network info */
/* PBS does not provide pool, machine speed, or network info */
N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd);
if (N->ActiveOS == 0)
N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd);
if (N->Network == 0)
N->Network = MUMAGetBM(eNetwork,"DEFAULT",mAdd);
@ -3000,9 +3001,10 @@ int MPBSNodeUpdate(
N->CRes.Swap = MAX(MIN_SWAP,N->CRes.Mem);
}
/* PBS does not provide pool, opsys, machine speed, or network info */
/* PBS does not provide pool, machine speed, or network info */
N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd);
if (N->ActiveOS == 0)
N->ActiveOS = MUMAGetIndex(eOpsys,"DEFAULT",mAdd);
if (N->Network == 0)
N->Network = MUMAGetBM(eNetwork,"DEFAULT",mAdd);
@ -5032,6 +5034,11 @@ int MPBSNodeSetAttr(
if (AP->value[0] != '?')
N->Arch = MUMAGetIndex(eArch,AP->value,mAdd);
}
else if (!strcmp(AP->resource,"opsys"))
{
if (AP->value[0] != '?')
N->ActiveOS = MUMAGetIndex(eOpsys,AP->value,mAdd);
}
else if (!strcmp(AP->resource,"mem"))
{
N->CRes.Mem = (MPBSGetResKVal(AP->value) >> 10);
@ -5474,6 +5481,10 @@ int MPBSJobSetAttr(
{
RQ->Arch = MUMAGetIndex(eArch,AP->value,mAdd);
}
else if (!strcmp(AP->resource,"opsys"))
{
RQ->Opsys = MUMAGetIndex(eOpsys,AP->value,mAdd);
}
else if (!strcmp(AP->resource,"pmem"))
{
/* NOTE: called 'workingset'? (indiana) */
@ -6037,6 +6048,10 @@ int __MPBSIGetSSSStatus(
{
N->Arch = MUMAGetIndex(eArch,Value,mAdd);
}
else if (!strcmp(Name,"opsys"))
{
N->ActiveOS = MUMAGetIndex(eOpsys,Value,mAdd);
}
else if (!strcmp(Name,"totmem"))
{
TotMem = (MPBSGetResKVal(Value) >> 10);