aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSomeoneSerge <else@someonex.net>2024-06-27 17:06:10 +0000
committerSomeoneSerge <else@someonex.net>2024-06-28 12:30:16 +0000
commit4b43a81d6082b7c6fe70234a5df912b3218bee05 (patch)
tree2296af3fe875c525fdf70575338c148e0bf0940c
parent2aa52fb69694d15a5ad1e2e9dd2894f13d383734 (diff)
job: "transitive" -> "!scheduled"
-rw-r--r--include/jobs.h2
-rw-r--r--src/jobs.c2
-rw-r--r--src/queue.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/include/jobs.h b/include/jobs.h
index 2e30547..7390306 100644
--- a/include/jobs.h
+++ b/include/jobs.h
@@ -10,7 +10,7 @@ struct output {
struct job {
char *name, *drv_path, *attr;
- bool transitive;
+ bool scheduled;
bool insubstituters;
size_t outputs_size, outputs_filled;
diff --git a/src/jobs.c b/src/jobs.c
index bda8d11..7851fef 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -367,7 +367,7 @@ static int job_new(struct job **j, char *name, char *drv_path,
print_err("%s", strerror(errno));
return -errno;
}
- job->transitive = true;
+ job->scheduled = false;
job->outputs_size = 0;
job->outputs_filled = 0;
diff --git a/src/queue.c b/src/queue.c
index 09eebb6..3a7ca52 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -41,7 +41,7 @@ static int queue_dag_isolate(struct job *job, struct job *keep_parent,
job->parents_filled = 0;
}
- if (!job->transitive)
+ if (job->scheduled)
CIRCLEQ_REMOVE(jobs, job, clist);
ret = htab_delete(htab, job->drv_path);
@@ -169,8 +169,8 @@ static int queue_push(struct queue *queue, struct job *job)
}
/* no duplicate entries in queue */
- if (job->transitive) {
- job->transitive = false;
+ if (!job->scheduled) {
+ job->scheduled = true;
CIRCLEQ_INSERT_TAIL(&queue->jobs, job, clist);
}
pthread_mutex_unlock(&queue->mutex);