From: Michael Tremer Date: Thu, 26 Jun 2025 09:47:38 +0000 (+0000) Subject: job: Give a reference to the client X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fe30393d9c1decefe39f5934d7e14c0351b400a;p=pakfire.git job: Give a reference to the client Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/builder.c b/src/pakfire/builder.c index 984d7192..3068dcbf 100644 --- a/src/pakfire/builder.c +++ b/src/pakfire/builder.c @@ -568,7 +568,7 @@ static int pakfire_builder_job(struct pakfire_builder* self, json_object* m) { } // Create a new job - r = pakfire_job_create(&job, self->ctx, self, data); + r = pakfire_job_create(&job, self->ctx, self->client, self, data); if (r) { ERROR(self->ctx, "Could not create a new job: %s\n", strerror(-r)); goto ERROR; diff --git a/src/pakfire/job.c b/src/pakfire/job.c index c539c975..d9b4edaa 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -880,7 +880,7 @@ int pakfire_job_stream_logs(struct pakfire_job* self) { } int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx, - struct pakfire_builder* builder, json_object* data) { + struct pakfire_client* client, struct pakfire_builder* builder, json_object* data) { struct pakfire_job* j = NULL; int r; @@ -905,10 +905,8 @@ int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx, goto ERROR; } -#if 0 // Fetch a reference to the client - j->client = pakfire_daemon_client(daemon); -#endif + j->client = pakfire_client_ref(client); // Initialize the PID file descriptor j->pidfd = -EBADF; diff --git a/src/pakfire/job.h b/src/pakfire/job.h index a930fc7e..69e28559 100644 --- a/src/pakfire/job.h +++ b/src/pakfire/job.h @@ -21,13 +21,16 @@ #ifndef PAKFIRE_JOB_H #define PAKFIRE_JOB_H +#include + #include +#include #include struct pakfire_job; -int pakfire_job_create(struct pakfire_job** worker, - struct pakfire_ctx* ctx, struct pakfire_builder* builder, json_object* data); +int pakfire_job_create(struct pakfire_job** worker, struct pakfire_ctx* ctx, + struct pakfire_client* client, struct pakfire_builder* builder, json_object* data); struct pakfire_job* pakfire_job_ref(struct pakfire_job* worker); struct pakfire_job* pakfire_job_unref(struct pakfire_job* worker);