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

change nodesets

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@33 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
dev
2005-09-23 15:25:46 +00:00
parent 2625ed201d
commit 9c781106e7
7 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/moab-proto.h
View File

@@ -334,7 +334,7 @@ int MJobDestroy(mjob_t **);
int MJobSelectPJobList(mjob_t *,int,int,mjob_t **,mnalloc_t *,mjob_t **,int *,int *,nodelist_t **);
int MJobCheckDependency(mjob_t *,enum MJobDependEnum *,char *);
int MJobSetDependency(mjob_t *,enum MJobDependEnum,char *);
int MJobSelectResourceSet(mjob_t *,int,int,char **,mnalloc_t *,int);
int MJobSelectResourceSet(mjob_t *,mreq_t *,int,int,char **,mnalloc_t *,int);
int MJobCheckNRes(mjob_t *,mnode_t *,mreq_t *,long,int *,double,int *,char *,long *,int);
int MJobGetEStartTime(mjob_t *,mpar_t **,int *,int *,mnodelist_t,long *);
int MJobAddToNL(mjob_t *,nodelist_t);

9
src/moab/MACL.c
View File

@@ -201,8 +201,7 @@ char *MACLShow(
case mcmpSNE:
default:
sprintf(ACLString,"%s%s%s%s",
ACLString,
sprintf(&ACLString[strlen(ACLString)],"%s%s%s",
MComp[cindex],
ACL.Name,
ModString);
@@ -220,16 +219,14 @@ char *MACLShow(
{
/* human readable */
sprintf(ACLString,"%s%s%s%s",
ACLString,
sprintf(&ACLString[strlen(ACLString)],"%s%s%s",
MComp[cindex],
MULToTString(ACL.Value),
ModString);
}
else
{
sprintf(ACLString,"%s%s%ld%s",
ACLString,
sprintf(&ACLString[strlen(ACLString)],"%s%ld%s",
MComp[cindex],
ACL.Value,
ModString);

3
src/moab/MAM.c
View File

@@ -2216,8 +2216,7 @@ int MAMConfigShow(
if (tmpVal[0] != '\0')
{
sprintf(tmpLine,"%s %s=%s",
tmpLine,
sprintf(&tmpLine[strlen(tmpLine)]," %s=%s",
MAMAttr[aindex],
tmpVal);
}

27
src/moab/MBF.c
View File

@@ -836,15 +836,13 @@ int MBFGetWindow(
{
if ((N->State != mnsIdle) && (N->State != mnsActive))
{
sprintf(Msg,"%snode %s is unavailable (state '%s')\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is unavailable (state '%s')\n",
N->Name,
MNodeState[N->State]);
}
else
{
sprintf(Msg,"%snode %s is unavailable (expected state '%s')\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is unavailable (expected state '%s')\n",
N->Name,
MNodeState[N->EState]);
}
@@ -859,8 +857,7 @@ int MBFGetWindow(
N->Name);
if (Msg != NULL)
sprintf(Msg,"%snode %s is unavailable (partition '%s')\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is unavailable (partition '%s')\n",
N->Name,
MPar[N->PtIndex].Name);
@@ -875,8 +872,7 @@ int MBFGetWindow(
if (Msg != NULL)
{
sprintf(Msg,"%snode %s is unavailable (%s)\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is unavailable (%s)\n",
N->Name,
MAllocRejType[RIndex]);
}
@@ -904,8 +900,7 @@ int MBFGetWindow(
if (Msg != NULL)
{
sprintf(Msg,"%snode %s does not meet requirements (%s)\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s does not meet requirements (%s)\n",
N->Name,
MAllocRejType[RIndex]);
}
@@ -928,8 +923,7 @@ int MBFGetWindow(
if (Msg != NULL)
{
sprintf(Msg,"%snode %s is blocked immediately\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is blocked immediately\n",
N->Name);
}
@@ -946,16 +940,14 @@ int MBFGetWindow(
{
if (AvailableTime < (MAX_MTIME >> 1))
{
sprintf(Msg,"%snode %s is blocked by reservation %s in %s\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %s is blocked by reservation %s in %s\n",
N->Name,
BRes,
MULToTString(AvailableTime));
}
else
{
sprintf(Msg,"%snode %sx%d is available with no timelimit\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %sx%d is available with no timelimit\n",
N->Name,
TC);
}
@@ -967,8 +959,7 @@ int MBFGetWindow(
{
if (Msg != NULL)
{
sprintf(Msg,"%snode %sx%d is available with no timelimit\n",
Msg,
sprintf(&Msg[strlen(Msg)],"node %sx%d is available with no timelimit\n",
N->Name,
TC);
}

6
src/moab/MClass.c
View File

@@ -318,8 +318,7 @@ int MClassShow(
(tmpLString[0] != '\0') &&
strcmp(tmpLString,NONE))
{
sprintf(tmpLine,"%s %s=%s",
tmpLine,
sprintf(&tmpLine[strlen(tmpLine)]," %s=%s",
MClassAttr[ClAList[aindex]],
tmpLString);
}
@@ -332,8 +331,7 @@ int MClassShow(
if ((MCredAToString((void *)C,mxoClass,CAList[aindex],tmpLString,mdfString) == SUCCESS) &&
(tmpLString[0] != '\0'))
{
sprintf(tmpLine,"%s %s=%s",
tmpLine,
sprintf(&tmpLine[strlen(tmpLine)]," %s=%s",
MCredAttr[CAList[aindex]],
tmpLString);
}

2
src/moab/MJob.c
View File

@@ -7298,6 +7298,7 @@ int MJobGetEStartTime(
if (MJobSelectResourceSet(
J,
RQ,
(RQ->SetType != mrstNONE) ? RQ->SetType : MPar[0].NodeSetAttribute,
(tmpRSS != mrssOneOf) ? tmpRSS : mrssFirstOf,
(RQ->SetList[0] != NULL) ? RQ->SetList : MPar[0].NodeSetList,
@@ -8765,6 +8766,7 @@ int MReqGetFNL(
MJobSelectResourceSet(
J,
RQ,
(RQ->SetType != mrstNONE) ? RQ->SetType : MPar[0].NodeSetAttribute,
(tmpRSS != mrssFirstOf) ? tmpRSS : mrssOneOf,
(RQ->SetList != NULL) ? RQ->SetList : MPar[0].NodeSetList,

9
src/moab/MSched.c
View File

@@ -392,6 +392,7 @@ int MJobAllocMNL(
if (MJobSelectResourceSet(
J,
RQ,
(RQ->SetType != mrstNONE) ? RQ->SetType : MPar[0].NodeSetAttribute,
(tmpRSS != mrssOneOf) ? tmpRSS : mrssFirstOf,
(RQ->SetList[0] != NULL) ? RQ->SetList : MPar[0].NodeSetList,
@@ -601,6 +602,7 @@ int MJobAllocMNL(
if ((nsindex == 0) && (MJobSelectResourceSet(
J,
RQ,
(RQ->SetType != mrstNONE) ? RQ->SetType : MPar[0].NodeSetAttribute,
(tmpRSS != mrssOneOf) ? tmpRSS : mrssFirstOf,
(RQ->SetList[0] != NULL) ? RQ->SetList : MPar[0].NodeSetList,
@@ -2023,6 +2025,7 @@ int MSchedTest()
int MJobSelectResourceSet(
mjob_t *J, /* I */
mreq_t *RQ, /* I */
int SetType, /* I */
int SetSelection, /* I */
char **SetList, /* I */
@@ -2065,8 +2068,6 @@ int MJobSelectResourceSet(
mnode_t *N;
mreq_t *RQ;
const char *FName = "MJobSelectResourceSet";
DBG(4,fSCHED) DPrint("%s(%s,%d,%d,SetList,NodeList,%d)\n",
@@ -2093,9 +2094,7 @@ int MJobSelectResourceSet(
return(SUCCESS);
}
RQ = J->Req[0];
TasksRequired = J->Request.TC;
TasksRequired = RQ->TaskCount;
NodesRequired = RQ->NodeCount;
memset(SetCount,0,sizeof(SetCount));