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

applied patch sent by Peter Gardfjaell

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@79 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
josh 2006-12-05 19:57:14 +00:00
parent 55d07dfb18
commit ed61d83031
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/moab/MJob.c
View File

@ -3324,13 +3324,13 @@ int MJobProcessExtensionString(
{
if ((aindex = MUGetIndex(key,MRMXAttr,TRUE,mxaNONE)) == mxaNONE)
{
key = MUStrTok(NULL,";\n",&TokPtr);
if (X.XJobProcessRMXString != (int (*)())0)
{
(*X.XJobProcessRMXString)(X.xd,J,key);
}
key = MUStrTok(NULL,";\n",&TokPtr);
continue;
}

6
src/moab/MStats.c
View File

@ -898,7 +898,8 @@ int MStatUpdateActiveJobUsage(
called from: MQueueAddAJob()
*/
if ((J->Req[0]->NAccessPolicy == mnacSingleJob) &&
if ((J->Req[0] != NULL) &&
(J->Req[0]->NAccessPolicy == mnacSingleJob) &&
(MSched.NodeAllocMaxPS == TRUE))
{
TotalProcs = J->NodesRequested;
@ -922,7 +923,8 @@ int MStatUpdateActiveJobUsage(
(double)MSched.Interval / 100.0,
(double)MSched.Time - J->StartTime);
if ((J->Req[0]->NAccessPolicy == mnacSingleJob) &&
if ((J->Req[0] != NULL) &&
(J->Req[0]->NAccessPolicy == mnacSingleJob) &&
(MSched.NodeAllocMaxPS == TRUE))
{
pesdedicated = TotalProcs * interval;