lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve zarray_iter

Browse source
This commit is contained in:
Rongsong Shen 2025-12-17 11:06:58 +08:00
parent 05abed1964
commit e85ce0e5ad
12 changed files with 72 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controller/dataex.c
View file

@ -186,7 +186,7 @@ void collect_confvars(cluster_t* c, collect_check_fn_t fn, int* nconfig,
xlist_store(&lst, count_);
xlist_store(&lst, add_confvar_);
rc = kvmgr_iter(&(c->configmgr), &lst, &args);
rc = kvmgr_iter(&(c->configmgr), NULL, &lst, &args);
xlist_fini(&lst);

2
src/controller/jobmgr.c
View file

@ -148,7 +148,7 @@ int jobmgr_iter(jobmgr_t* mgr, xlist_t* l, void* arg)
int rc = 0;
mylock_lock(&(mgr->lock));
rc = zarray_iter_ex(&(mgr->jobs), l, arg);
rc = zarray_iter_ex(&(mgr->jobs), NULL, l, arg);
mylock_unlock(&(mgr->lock));
return rc;

2
src/controller/qmgr.c
View file

@ -149,7 +149,7 @@ int qmgr_iter(qmgr_t* mgr, xlist_t* l, void* arg)
int rc = 0;
mylock_lock(&(mgr->lock));
rc = zarray_iter_ex(&(mgr->queues), l, arg);
rc = zarray_iter_ex(&(mgr->queues), NULL, l, arg);
mylock_unlock(&(mgr->lock));
return rc;

2
src/controller/resmgr.c
View file

@ -184,7 +184,7 @@ int resmgr_iter(resmgr_t* mgr, xlist_t* l, void* arg)
int rc = 0;
mylock_lock(&(mgr->lock));
rc = zarray_iter_ex(&(mgr->defs), l, arg);
rc = zarray_iter_ex(&(mgr->defs), NULL, l, arg);
mylock_unlock(&(mgr->lock));
return rc;

22
src/controller/workermgr.c
View file

@ -107,14 +107,10 @@ worker_t* workermgr_lock(workermgr_t* mgr, char* name, int op)
return NULL;
}
/* clang-format off */
if ((op != OBJREF_NOP) &&
(op != OBJREF_READ) &&
(op != OBJREF_UPDATE)) {
SET_ERROR(EINVAL);
return NULL;
if ((op != OBJREF_NOP) && (op != OBJREF_READ) && (op != OBJREF_UPDATE)) {
SET_ERROR(EINVAL);
return NULL;
}
/* clang-format on */
mylock_lock(&(mgr->lock));
w = workermgr_lock_(mgr, name, op);
@ -137,14 +133,10 @@ worker_t* workermgr_lock_byid(workermgr_t* mgr, int idx, int op)
return NULL;
}
/* clang-format off */
if ((op != OBJREF_NOP) &&
(op != OBJREF_READ) &&
(op != OBJREF_UPDATE)) {
SET_ERROR(EINVAL);
return NULL;
if ((op != OBJREF_NOP) && (op != OBJREF_READ) && (op != OBJREF_UPDATE)) {
SET_ERROR(EINVAL);
return NULL;
}
/* clang-format on */
mylock_lock(&(mgr->lock));
w = (worker_t*)zarray_get(&(mgr->workers), idx);
@ -191,7 +183,7 @@ int workermgr_iter(workermgr_t* mgr, xlist_t* l, void* arg)
int rc = 0;
mylock_lock(&(mgr->lock));
rc = zarray_iter_ex(&(mgr->workers), l, arg);
rc = zarray_iter_ex(&(mgr->workers), NULL, l, arg);
mylock_unlock(&(mgr->lock));
return rc;