Changeset 81c4e6ec in mainline for uspace/srv/sysman/job_closure.c

Timestamp:

2020-07-05T20:46:27Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Parents:

a73aaec1

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-07-05 20:37:10)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-07-05 20:46:27)

Message:

removing adt/array and replace it with adt/list in sysman

File:

• uspace/srv/sysman/job_closure.c (modified) (7 diffs)

uspace/srv/sysman/job_closure.c

@@ -63 +63 @@
 static errno_t job_add_blocked_job(job_t *blocking_job, job_t *blocked_job)
 {
-        assert(blocking_job->blocked_jobs.size ==
+        assert(list_count(&blocking_job->blocked_jobs) ==
             blocking_job->blocked_jobs_count);
 
-        errno_t rc = array_append(&blocking_job->blocked_jobs, job_t *,
-            blocked_job);
-        if (rc != EOK) {
+        job_link_t *job_link = calloc(1, sizeof(job_link_t));
+        if (job_link == NULL) {
                 return ENOMEM;
         }
+
+        job_link->job = blocked_job;
+
+        list_append(&job_link->link, &blocking_job->blocked_jobs);
+
         job_add_ref(blocked_job);
 
@@ -97 +101 @@
                         goto finish;
                 }
-                job_t *first_job = array_last(closure, job_t *);
+
+                link_t *last_link = list_last(closure);
+                job_link_t *job_link = list_get_instance(last_link, job_link_t, link);
+                job_t *first_job = job_link->job;
 
                 job_add_ref(first_job);
@@ -118 +125 @@
                 }
 
+                job_link_t *job_link = calloc(1, sizeof(job_link_t));
+                if (job_link == NULL) {
+                        goto finish;
+                }
+
+                job_link->job = created_job;
+
                 /* Pass job reference to closure and add one for unit */
-                rc = array_append(closure, job_t *, created_job);
-                if (rc != EOK) {
-                        goto finish;
-                }
+                list_append(&job_link->link, closure);
 
                 job_add_ref(created_job);
@@ -164 +175 @@
                 }
 
+                job_link_t *job_link = calloc(1, sizeof(job_link_t));
+                if (job_link == NULL) {
+                        goto finish;
+                }
+
+                job_link->job = created_job;
+
                 /* Pass job reference to closure and add one for unit */
-                rc = array_append(closure, job_t *, created_job);
-                if (rc != EOK) {
-                        goto finish;
-                }
+                list_append(&job_link->link, closure);
         }
         rc = visit_propagate_job(u, e, ops, closure);
@@ -308 +323 @@
         }
 
-        errno_t rc = array_append(job_closure, job_t *, main_job);
-        if (rc != EOK) {
-                return rc;
-        }
+        job_link_t *job_link = calloc(1, sizeof(job_link_t));
+        if (job_link == NULL) {
+                return ENOMEM;
+        }
+
+        job_link->job = main_job;
+
+        list_append(&job_link->link, job_closure);
+
         job_add_ref(main_job); /* Add one for the closure */
 
@@ -330 +350 @@
         }
 
-        rc = bfs_traverse_component(main_job->unit, &propagate_ops, job_closure);
+        errno_t rc = bfs_traverse_component(main_job->unit, &propagate_ops, job_closure);
 
         sysman_log(LVL_DEBUG2, "%s: %i&%i", __func__, flags, CLOSURE_ISOLATE);
@@ -343 +363 @@
 
         if (rc == EOK) {
-                array_foreach(*job_closure, job_t *, job_it) {
+                list_foreach(*job_closure, link, job_link_t, job_it) {
+                        job_t *job = job_it->job;
                         sysman_log(LVL_DEBUG2, "%s\t%s, refs: %u", __func__,
-                            unit_name((*job_it)->unit), atomic_load(&(*job_it)->refcnt));
+                            unit_name(job->unit), atomic_load(&job->refcnt));
                 }
         }
 
         /* Clean after ourselves (BFS tag jobs) */
-        array_foreach(*job_closure, job_t *, job_it) {
-                job_t *j = (*job_it)->unit->bfs_data;
-                assert(*job_it == j);
+        list_foreach(*job_closure, link, job_link_t, job_it) {
+                job_t *j = job_it->job->unit->bfs_data;
+                assert(job_it->job == j);
                 job_del_ref(&j);
-                (*job_it)->unit->bfs_data = NULL;
-        }
-
-        return rc;
-}
+                job_it->job->unit->bfs_data = NULL;
+        }
+
+        return rc;
+}