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

improve ordq

Browse source
This commit is contained in:
Rongsong Shen 2025-12-22 11:58:04 +08:00
parent abea3375ca
commit c12fcf6905
4 changed files with 70 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/scheduler/src/plugin_fcfs.c
View file

@ -105,10 +105,10 @@ static int fcfs_update_config(void* arg, xce_conf4sched_t* config)
return 0;
}
static int skip_not_matched_queue(void* arg1, void* arg2)
static int skip_not_matched_queue(void* arg1, va_list ap)
{
char* name = (char*)arg1;
fcfs_queue_t* q = (fcfs_queue_t*)arg2;
fcfs_queue_t* q = (fcfs_queue_t*)arg1;
char* name = va_arg(ap, char*);
if ((name == NULL) || (q == NULL)) {
return 1;
@ -126,8 +126,8 @@ static int fcfs_update_queue(void* arg, xce_sched_queue_t* q)
TRACE("%s queue %s...", __func__, q->name);
privdata->queues.ctx = q->name;
it = ordq_get(&(privdata->queues), (ordq_skip_fn_t)skip_not_matched_queue);
it = ordq_get(&(privdata->queues), (ordq_skip_fn_t)skip_not_matched_queue,
q->name);
if (it == NULL) {
queue = (fcfs_queue_t*)calloc(1, sizeof(*queue));
if (queue == NULL) {
@ -151,8 +151,7 @@ static fcfs_queue_t* fcfs_get_queue(fcfs_plugin_data_t* data, char* name)
{
ordq_item_t* it = NULL;
data->queues.ctx = name;
it = ordq_peek(&(data->queues), (ordq_skip_fn_t)skip_not_matched_queue);
it = ordq_peek(&(data->queues), (ordq_skip_fn_t)skip_not_matched_queue, name);
if (it == NULL) {
return NULL;
}
@ -194,9 +193,9 @@ static int fcfs_update_job(void* arg, xce_sched_job_t* j)
return 0;
}
static int skip_no_pend_job_queue(void* arg1, void* arg2)
static int skip_no_pend_job_queue(void* arg1, va_list ap)
{
fcfs_queue_t* q = (fcfs_queue_t*)arg2;
fcfs_queue_t* q = (fcfs_queue_t*)arg1;
if (q == NULL) {
return 1;
@ -205,9 +204,9 @@ static int skip_no_pend_job_queue(void* arg1, void* arg2)
return (ordq_peek(&(q->pendJobs), NULL) == NULL);
}
static int skip_not_ready_job(void* arg1, void* arg2)
static int skip_not_ready_job(void* arg1, va_list ap)
{
fcfs_job_t* job = (fcfs_job_t*)arg2;
fcfs_job_t* job = (fcfs_job_t*)arg1;
return !sched_job_is_ready(job->job);
}