Changeset 4fe7fcb in mainline

Timestamp:

2019-08-03T07:37:38Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

6efec7e3

Parents:

c0c388d2

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-03-16 22:13:54)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 07:37:38)

Message:

Transform unit dependencies to job ordering

Location:

uspace/srv/sysman

Files:

• job.c (modified) (1 diff)
• job.h (modified) (1 diff)
• sysman.c (modified) (2 diffs)

uspace/srv/sysman/job.c

@@ -212 +212 @@
 }
 
+int job_add_blocking_job(job_t *job, job_t *blocking_job)
+{
+        job_link_t *job_link = malloc(sizeof(job_link_t));
+        if (job_link == NULL) {
+                return ENOMEM;
+        }
+
+        link_initialize(&job_link->link);
+        list_append(&job_link->link, &job->blocking_jobs);
+
+        job_link->job = blocking_job;
+        job_add_ref(blocking_job);
+
+        return EOK;
+}
+
 static void job_destroy(job_t **job_ptr)
 {

uspace/srv/sysman/job.h

@@ -55 +55 @@
 
 extern job_t *job_create(job_type_t type);
+extern int job_add_blocking_job(job_t *, job_t *);
 
 #endif

uspace/srv/sysman/sysman.c

@@ -6 +6 @@
 #include "sysman.h"
 
+/** Create jobs for cluser of given unit.
+ *
+ * @note Using recursion, limits "depth" of dependency graph.
+ */
 static int sysman_create_closure_jobs(unit_t *unit, job_t **entry_job_ptr,
     list_t *accumulator, job_type_t type)
@@ -17 +21 @@
 
         job->unit = unit;
-        // TODO set blocking jobs
 
         list_foreach(unit->dependencies, dependencies, unit_dependency_t, edge) {
-                rc = sysman_create_closure_jobs(edge->dependency, NULL,
+                job_t *blocking_job = NULL;
+                rc = sysman_create_closure_jobs(edge->dependency, &blocking_job,
                     accumulator, type);
+                if (rc != EOK) {
+                        goto fail;
+                }
+                
+                rc = job_add_blocking_job(job, blocking_job);
                 if (rc != EOK) {
                         goto fail;