Changeset 72c8f77 in mainline for uspace/srv/sysman/job.h

Timestamp:

2019-08-06T18:30:29Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

63a3276

Parents:

c2d50c8

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-26 16:15:58)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 18:30:29)

Message:

sysman: Separate job closure creation and its enqueuing

• added merge job operation
• created test that failed with previous implementation of job closure

File:

• uspace/srv/sysman/job.h (modified) (4 diffs)

uspace/srv/sysman/job.h

@@ -37 +37 @@
 #include "unit.h"
 
-// TODO simplify queue states
 /** Run state of job */
 typedef enum {
-        JOB_UNQUEUED, /**< Job not in queue yet */
-        JOB_QUEUED,
-        JOB_DEQUEUED, /**< Job not in queue already */
+        JOB_EMBRYO, /**< Job after creation */
+        JOB_CLOSURED, /**< Intermmediate when closure is evaluated */
+        JOB_PENDING, /**< Job is queued */
         JOB_RUNNING,
         JOB_FINISHED
@@ -54 +53 @@
 } job_retval_t;
 
+struct job;
+typedef struct job job_t;
+
 struct job {
         link_t job_queue;
@@ -63 +65 @@
         /** Jobs that this job is preventing from running */
         dyn_array_t blocked_jobs;
+        /** No. of jobs that the job is actually blocking (may differ from size
+         * of blocked_jobs for not fully merged job */
+        size_t blocked_jobs_count;
         /** No. of jobs that must finish before this job */
         size_t blocking_jobs;
         /** Any of blocking jobs failed */
         bool blocking_job_failed;
+        /** Job that this job was merged to */
+        job_t *merged_into;
 
         /** See job_state_t */
@@ -74 +81 @@
 };
 
-typedef struct job job_t;
-typedef job_t *job_ptr_t;
-
 extern void job_queue_init(void);
-extern int job_queue_add_jobs(dyn_array_t *);
+extern int job_queue_add_closure(dyn_array_t *);
 extern void job_queue_process(void);