minor improve
This commit is contained in:
parent
897ca481b6
commit
c1c9f9e736
4 changed files with 5 additions and 7 deletions
|
|
@ -126,7 +126,7 @@ static xce_resource_t* makeResource_(var resmgr, xce_resource_t* r)
|
||||||
resobj = makeInstance(&resobj_type, r);
|
resobj = makeInstance(&resobj_type, r);
|
||||||
if (resobj != NULL) {
|
if (resobj != NULL) {
|
||||||
rc = key_add(resmgr, (void*)resobj->name, (void*)resobj);
|
rc = key_add(resmgr, (void*)resobj->name, (void*)resobj);
|
||||||
|
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
destroy(resobj);
|
destroy(resobj);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -308,7 +308,6 @@ int build_vres_name(char** vname, xce_limit_t* limit, char* user, char* queue,
|
||||||
size_t bufsize = 0;
|
size_t bufsize = 0;
|
||||||
FILE* fp = NULL;
|
FILE* fp = NULL;
|
||||||
xce_consumer_t* c = NULL;
|
xce_consumer_t* c = NULL;
|
||||||
int rc = 0;
|
|
||||||
|
|
||||||
*vname = NULL;
|
*vname = NULL;
|
||||||
if ((vname == NULL) || (limit == NULL) || (user == NULL) || (queue == NULL)
|
if ((vname == NULL) || (limit == NULL) || (user == NULL) || (queue == NULL)
|
||||||
|
|
@ -339,10 +338,8 @@ int build_vres_name(char** vname, xce_limit_t* limit, char* user, char* queue,
|
||||||
fprintf(fp, "/p=%s", project);
|
fprintf(fp, "/p=%s", project);
|
||||||
}
|
}
|
||||||
|
|
||||||
fflush(fp);
|
|
||||||
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
if ((*vname) != NULL) {
|
if ((*vname) != NULL) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -447,7 +447,7 @@ static int xzarray_ensure_items(xzarray_t* array, int mincap)
|
||||||
if (array->data[array->pos].inuse) {
|
if (array->data[array->pos].inuse) {
|
||||||
array->pos = array->caps;
|
array->pos = array->caps;
|
||||||
}
|
}
|
||||||
|
|
||||||
array->caps = nc;
|
array->caps = nc;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
||||||
|
|
@ -476,7 +476,8 @@ static int sched_init_resources(xce_scheduler_t* sched)
|
||||||
r1 = makeResource(sched->resmgr, r);
|
r1 = makeResource(sched->resmgr, r);
|
||||||
|
|
||||||
if (r1 == NULL) {
|
if (r1 == NULL) {
|
||||||
ERROR("%s add resource %s failed", __func__, r->name);
|
ERROR("%s add resource %s failed", __func__,
|
||||||
|
r->name ? r->name : "(null)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue