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

Timestamp:

2020-07-05T20:46:27Z (5 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.c (modified) (3 diffs)

uspace/srv/sysman/job.c

@@ -70 +70 @@
         job->unit = u;
 
-        array_initialize(&job->blocked_jobs, job_t *);
+        list_initialize(&job->blocked_jobs);
         job->blocking_jobs = 0;
         job->blocking_job_failed = false;
@@ -120 +120 @@
         assert(!link_used(&job->job_queue));
 
-        array_foreach(job->blocked_jobs, job_t *, job_it) {
-                job_del_ref(&(*job_it));
-        }
-        array_destroy(&job->blocked_jobs);
+        while (!list_empty(&job->blocked_jobs)) {
+                job_link_t *job_it = list_pop(&job->blocked_jobs, job_link_t, link);
+                job_del_ref(&job_it->job);
+                free(job_it);
+        }
 
         free(job);
@@ -256 +257 @@
 
         /* First remove references, then clear the array */
-        assert(job->blocked_jobs.size == job->blocked_jobs_count);
-        array_foreach(job->blocked_jobs, job_t *, job_it) {
-                job_unblock(*job_it, job);
-        }
-        array_clear(&job->blocked_jobs);
+        assert(list_count(&job->blocked_jobs) == job->blocked_jobs_count);
+
+        while (!list_empty(&job->blocked_jobs)) {
+                job_link_t *job_it = list_pop(&job->blocked_jobs, job_link_t, link);
+                job_unblock(job_it->job, job);
+                free(job_it);
+        }
 
         /* Add reference for event handler */