reformat code and job array
This commit is contained in:
parent
a665ccd4fe
commit
9ff857db9f
64 changed files with 1497 additions and 2476 deletions
|
|
@ -9,14 +9,10 @@
|
|||
#include "xce/errnox.h"
|
||||
#include "xstring.h"
|
||||
|
||||
int jobmgr_init(jobmgr_t* mgr,
|
||||
int nhslots,
|
||||
int delta)
|
||||
int jobmgr_init(jobmgr_t* mgr, int nhslots, int delta)
|
||||
{
|
||||
ht_init(&(mgr->htab), nhslots,
|
||||
int_hash_key);
|
||||
zarray_init(&(mgr->jobs), delta,
|
||||
(zarray_item_killer_t)job_obj_killer);
|
||||
ht_init(&(mgr->htab), nhslots, int_hash_key);
|
||||
zarray_init(&(mgr->jobs), delta, (zarray_item_killer_t)job_obj_killer);
|
||||
mylock_init(&(mgr->lock));
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -28,9 +24,7 @@ void jobmgr_fini(jobmgr_t* mgr)
|
|||
mylock_fini(&(mgr->lock));
|
||||
}
|
||||
|
||||
job_t* jobmgr_lockjob_(jobmgr_t* mgr,
|
||||
uint64_t jobid,
|
||||
int op)
|
||||
job_t* jobmgr_lockjob_(jobmgr_t* mgr, uint64_t jobid, int op)
|
||||
{
|
||||
hent_t* e = NULL;
|
||||
int idx;
|
||||
|
|
@ -54,9 +48,7 @@ job_t* jobmgr_lockjob_(jobmgr_t* mgr,
|
|||
return obj_ref(job, op);
|
||||
}
|
||||
|
||||
job_t* jobmgr_lockjob(jobmgr_t* mgr,
|
||||
uint64_t jobid,
|
||||
int op)
|
||||
job_t* jobmgr_lockjob(jobmgr_t* mgr, uint64_t jobid, int op)
|
||||
{
|
||||
job_t* job = NULL;
|
||||
|
||||
|
|
@ -81,14 +73,12 @@ job_t* jobmgr_lockjob(jobmgr_t* mgr,
|
|||
return job;
|
||||
}
|
||||
|
||||
static int32_t jobmgr_add_job_(jobmgr_t* mgr,
|
||||
job_t* job)
|
||||
static int32_t jobmgr_add_job_(jobmgr_t* mgr, job_t* job)
|
||||
{
|
||||
hent_t* e = NULL;
|
||||
int idx;
|
||||
|
||||
e = ht_get(&(mgr->htab),
|
||||
(void*)job->job.jobid);
|
||||
e = ht_get(&(mgr->htab), (void*)job->job.jobid);
|
||||
if (e != NULL) {
|
||||
return -EEXIST;
|
||||
}
|
||||
|
|
@ -98,8 +88,7 @@ static int32_t jobmgr_add_job_(jobmgr_t* mgr,
|
|||
return idx;
|
||||
}
|
||||
|
||||
e = ht_add(&(mgr->htab),
|
||||
(void*)job->job.jobid);
|
||||
e = ht_add(&(mgr->htab), (void*)job->job.jobid);
|
||||
if (e == NULL) {
|
||||
zarray_del(&(mgr->jobs), idx);
|
||||
return -errno;
|
||||
|
|
@ -109,8 +98,7 @@ static int32_t jobmgr_add_job_(jobmgr_t* mgr,
|
|||
return idx;
|
||||
}
|
||||
|
||||
int32_t jobmgr_add_job(jobmgr_t* mgr,
|
||||
job_t* job)
|
||||
int32_t jobmgr_add_job(jobmgr_t* mgr, job_t* job)
|
||||
{
|
||||
int32_t idx;
|
||||
|
||||
|
|
@ -125,14 +113,12 @@ int32_t jobmgr_add_job(jobmgr_t* mgr,
|
|||
return idx;
|
||||
}
|
||||
|
||||
static void jobmgr_del_job_(jobmgr_t* mgr,
|
||||
job_t* job)
|
||||
static void jobmgr_del_job_(jobmgr_t* mgr, job_t* job)
|
||||
{
|
||||
hent_t* e = NULL;
|
||||
int idx;
|
||||
|
||||
e = ht_get(&(mgr->htab),
|
||||
(void*)job->job.jobid);
|
||||
e = ht_get(&(mgr->htab), (void*)job->job.jobid);
|
||||
if (e == NULL) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -147,8 +133,7 @@ static void jobmgr_del_job_(jobmgr_t* mgr,
|
|||
return;
|
||||
}
|
||||
|
||||
void jobmgr_del_job(jobmgr_t* mgr,
|
||||
job_t* job)
|
||||
void jobmgr_del_job(jobmgr_t* mgr, job_t* job)
|
||||
{
|
||||
if ((mgr == NULL) || (job == NULL)) {
|
||||
return;
|
||||
|
|
@ -158,9 +143,7 @@ void jobmgr_del_job(jobmgr_t* mgr,
|
|||
mylock_unlock(&(mgr->lock));
|
||||
}
|
||||
|
||||
int jobmgr_iter(jobmgr_t* mgr,
|
||||
xlist_t* l,
|
||||
void* arg)
|
||||
int jobmgr_iter(jobmgr_t* mgr, xlist_t* l, void* arg)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue