Changeset be07995 in mainline for uspace/srv/sysman/test/job_closure.c

Timestamp:

2019-08-17T13:54:09Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

8d74fdd

Parents:

015b147

git-author:

Michal Koutný <xm.koutny+hos@…> (2016-01-10 23:36:33)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-17 13:54:09)

Message:

sysman: Add support for closure creation with CLOSURE_ISOLATE flag

Now can create closures, that contain start jobs for all transitively dependent
jobs and stop for all others. (Next step: enqueue and execute.)

File:

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

uspace/srv/sysman/test/job_closure.c

@@ -32 +32 @@
 
 #include "../job_closure.h"
+#include "../repo.h"
 
 #include "mock_unit.h"
@@ -50 +51 @@
 {
         if (expected->size != actual->size) {
-                printf("%s: |expected| - |actual| = %u\n",
-                    __func__, expected->size - actual->size);
+                printf("%s: |expected|, |actual| = %u, %u\n",
+                    __func__, expected->size, actual->size);
                 return false;
         }
@@ -119 +120 @@
         rc = dyn_array_reserve(&act_closure, MAX_TYPES * MAX_UNITS);
         assert(rc == EOK);
+
+        repo_init();
 }
 
@@ -148 +151 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure);
+        int rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -179 +182 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure);
+        int rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -212 +215 @@
         assert(main_job);
 
-        int rc = job_create_closure(main_job, &act_closure);
+        int rc = job_create_closure(main_job, &act_closure, 0);
         PCUT_ASSERT_INT_EQUALS(EOK, rc);
 
@@ -227 +230 @@
 }
 
+PCUT_TEST(job_closure_isolate_linears) {
+        unit_t *u0 = mock_units[UNIT_SERVICE][0];
+        unit_t *u1 = mock_units[UNIT_SERVICE][1];
+        unit_t *u2 = mock_units[UNIT_SERVICE][2];
+        unit_t *u3 = mock_units[UNIT_SERVICE][3];
+        unit_t *u4 = mock_units[UNIT_SERVICE][4];
+        unit_t *u5 = mock_units[UNIT_SERVICE][5];
+        unit_t *u6 = mock_units[UNIT_SERVICE][6];
+        repo_begin_update();
+        for (int i = 0; i < 7; ++i) {
+                repo_add_unit(mock_units[UNIT_SERVICE][i]);
+        }
+        repo_commit();
+
+        /*
+         *
+         * u0 -> u1 -> u2
+         *
+         * u3 -> u4 -> u5
+         *
+         * u6
+         */
+        mock_add_edge(u0, u1);
+        mock_add_edge(u1, u2);
+
+        mock_add_edge(u3, u4);
+        mock_add_edge(u4, u5);
+
+        job_t *main_job = job_create(u1, STATE_STARTED);
+        assert(main_job);
+
+        int rc = job_create_closure(main_job, &act_closure, CLOSURE_ISOLATE);
+        PCUT_ASSERT_INT_EQUALS(EOK, rc);
+
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u0, STATE_STOPPED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u1, STATE_STARTED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u2, STATE_STARTED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u3, STATE_STOPPED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u4, STATE_STOPPED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u5, STATE_STOPPED));
+        dyn_array_append(&exp_closure, job_t *, dummy_job(u6, STATE_STOPPED));
+
+        dummy_add_closure(&act_closure);
+
+        PCUT_ASSERT_TRUE(same_jobs(&exp_closure, &act_closure));
+        PCUT_ASSERT_TRUE(job_blocked(u1->job, u2->job));
+
+        PCUT_ASSERT_TRUE(job_blocked(u5->job, u4->job));
+        PCUT_ASSERT_TRUE(job_blocked(u4->job, u3->job));
+
+        PCUT_ASSERT_INT_EQUALS(0, u6->job->blocking_jobs);
+        PCUT_ASSERT_INT_EQUALS(0, u0->job->blocking_jobs);
+}
 
 PCUT_EXPORT(job_closure);