diff options
Diffstat (limited to 'tools/server/schedule.c')
| -rw-r--r-- | tools/server/schedule.c | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/tools/server/schedule.c b/tools/server/schedule.c index c13e0cf..01538cc 100644 --- a/tools/server/schedule.c +++ b/tools/server/schedule.c @@ -36,6 +36,34 @@ static void enqueue_done(job *j) { } } +void enqueue_render_job(job *j) { + http_server *s = j->srv; + pthread_mutex_lock(&s->mu); + if (s->render_tail) + s->render_tail->next = j; + else + s->render_head = j; + s->render_tail = j; + pthread_cond_signal(&s->render_cv); + pthread_mutex_unlock(&s->mu); +} + +job *dequeue_render_job(http_server *s) { + pthread_mutex_lock(&s->mu); + while (!s->render_head && !s->render_stopping) + pthread_cond_wait(&s->render_cv, &s->mu); + + job *j = s->render_head; + if (j) { + s->render_head = j->next; + if (!s->render_head) + s->render_tail = NULL; + j->next = NULL; + } + pthread_mutex_unlock(&s->mu); + return j; +} + static job *pop_job_locked(http_server *s) { job *j = s->job_head; if (j) { @@ -143,6 +171,7 @@ static job *pop_done(http_server *s) { static void job_free(job *j) { if (!j) return; + job_render_free(j); free(j->body); free(j->auth); free(j->extra_headers); @@ -192,6 +221,11 @@ static void job_set_timing_header(job *j) { j->extra_headers = xstrdup(buf); } +void finish_job(job *j) { + job_set_timing_header(j); + enqueue_done(j); +} + static int parse_job_root(job *j, cJSON **out_root) { cJSON *detail = cJSON_CreateArray(); cJSON *root = parse_json_body(j, detail); @@ -260,24 +294,21 @@ void process_job_group(http_server *s, job **jobs, int n_jobs) { if (!kind[i]) { process_unknown_job(jobs[i]); - job_set_timing_header(jobs[i]); - enqueue_done(jobs[i]); + finish_job(jobs[i]); done[i] = 1; continue; } if ((kind[i] == 1 && !std_reqs[i].ready) || (kind[i] == 2 && !ctx_reqs[i].ready) || (kind[i] == 3 && !rerank_reqs[i].ready)) { - job_set_timing_header(jobs[i]); - enqueue_done(jobs[i]); + finish_job(jobs[i]); done[i] = 1; continue; } if (kind[i] == 3) { execute_rerank_request(&rerank_reqs[i]); - job_set_timing_header(jobs[i]); - enqueue_done(jobs[i]); + finish_job(jobs[i]); done[i] = 1; } else if (kind[i] == 1) { int group_n = 1; @@ -297,8 +328,10 @@ void process_job_group(http_server *s, job **jobs, int n_jobs) { execute_embedding_request_list(std_group, group_n); for (int k = 0; k < group_n; k++) { int idx = (int)(std_group[k] - std_reqs); - job_set_timing_header(jobs[idx]); - enqueue_done(jobs[idx]); + if (jobs[idx]->render_kind) + enqueue_render_job(jobs[idx]); + else + finish_job(jobs[idx]); done[idx] = 1; } } else { @@ -319,8 +352,7 @@ void process_job_group(http_server *s, job **jobs, int n_jobs) { execute_contextual_request_list(ctx_group, group_n); for (int k = 0; k < group_n; k++) { int idx = (int)(ctx_group[k] - ctx_reqs); - job_set_timing_header(jobs[idx]); - enqueue_done(jobs[idx]); + finish_job(jobs[idx]); done[idx] = 1; } } |
