Changeset 81c4e6ec in mainline for uspace/srv/sysman/job_queue.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_queue.c (modified) (7 diffs)

uspace/srv/sysman/job_queue.c

@@ -103 +103 @@
  * @return error code on fail
  */
-static errno_t job_pre_merge(job_t *trunk, job_t *other)
+static void job_pre_merge(job_t *trunk, job_t *other)
 {
         assert(trunk->unit == other->unit);
         assert(trunk->target_state == other->target_state);
-        assert(trunk->blocked_jobs.size == trunk->blocked_jobs_count);
+        assert(list_count(&trunk->blocked_jobs) == trunk->blocked_jobs_count);
         assert(other->merged_into == NULL);
 
-        errno_t rc = array_concat(&trunk->blocked_jobs, &other->blocked_jobs);
-        if (rc != EOK) {
-                return rc;
-        }
-        array_clear(&other->blocked_jobs);
+        list_concat(&trunk->blocked_jobs, &other->blocked_jobs);
+
+        while (!list_empty(&other->blocked_jobs)) {
+                job_link_t *job_link = list_pop(&other->blocked_jobs, job_link_t, link);
+                free(job_link);
+        }
 
         // TODO allocate observed object
 
         other->merged_into = trunk;
-
-        return EOK;
 }
 
 static void job_finish_merge(job_t *trunk, job_t *other)
 {
-        assert(trunk->blocked_jobs.size >= trunk->blocked_jobs_count);
+        assert(list_count(&trunk->blocked_jobs) >= trunk->blocked_jobs_count);
         //TODO aggregate merged blocked_jobs
-        trunk->blocked_jobs_count = other->blocked_jobs.size;
+        trunk->blocked_jobs_count = list_count(&other->blocked_jobs);
 
         /*
@@ -144 +143 @@
 static void job_undo_merge(job_t *trunk)
 {
-        assert(trunk->blocked_jobs.size >= trunk->blocked_jobs_count);
-        array_clear_range(&trunk->blocked_jobs,
-            trunk->blocked_jobs_count, trunk->blocked_jobs.size);
+        unsigned long count = list_count(&trunk->blocked_jobs);
+        assert(count >= trunk->blocked_jobs_count);
+
+        while (count-- > 0) {
+                link_t *last_link = list_last(&trunk->blocked_jobs);
+                job_link_t *job_link = list_get_instance(last_link, job_link_t, link);
+                list_remove(last_link);
+                free(job_link);
+        }
 }
 
@@ -172 +177 @@
 
         /* Check consistency with existing jobs. */
-        array_foreach(*closure, job_t *, job_it) {
-                job_t *job = *job_it;
+        list_foreach(*closure, link, job_link_t, job_it) {
+                job_t *job = job_it->job;
                 job_t *other_job = job->unit->job;
 
@@ -205 +210 @@
                         // TODO think about other options to merging
                         //      (replacing, cancelling)
-                        rc = job_pre_merge(other_job, job);
-                        if (rc != EOK) {
-                                break;
-                        }
+                        job_pre_merge(other_job, job);
                 }
         }
@@ -214 +216 @@
         /* Aggregate merged jobs, or rollback any changes in existing jobs */
         bool finish_merge = (rc == EOK) && !has_error;
-        array_foreach(*closure, job_t *, job_it) {
-                if ((*job_it)->merged_into == NULL) {
+        list_foreach(*closure, link, job_link_t, job_it) {
+                job_t *job = job_it->job;
+                if (job->merged_into == NULL) {
                         continue;
                 }
                 if (finish_merge) {
-                        job_finish_merge((*job_it)->merged_into, *job_it);
+                        job_finish_merge(job->merged_into, job);
                 } else {
-                        job_undo_merge((*job_it)->merged_into);
+                        job_undo_merge(job->merged_into);
                 }
         }
@@ -236 +239 @@
          *      in their blocked_jobs array.
          */
-        array_foreach(*closure, job_t *, job_it) {
-                job_t *job = (*job_it);
+        list_foreach(*closure, link, job_link_t, job_it) {
+                job_t *job = job_it->job;
                 if (job->merged_into != NULL) {
                         job_del_ref(&job);
@@ -255 +258 @@
 
         /* We've stolen references from the closure, so erase it */
-        array_clear(closure);
+        while (!list_empty(closure)) {
+                job_link_t *job_link = list_pop(closure, job_link_t, link);
+                free(job_link);
+        }
 
         return EOK;