Changeset 9532981 in mainline for uspace/srv/sysman/test

Timestamp:

2019-08-07T09:35:37Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

db34424

Parents:

af92309

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-02 23:10:51)

git-committer:

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

Message:

sysman: Rename dependency to edge (more generic)

Location:

uspace/srv/sysman/test

Files:

• job_closure.c (modified) (3 diffs)
• job_queue.c (modified) (1 diff)
• mock_unit.c (modified) (2 diffs)
• mock_unit.h (modified) (1 diff)

uspace/srv/sysman/test/job_closure.c

@@ -140 +140 @@
          * u0 -> u1 -> u2 -> u3
          */
-        mock_add_dependency(u0, u1);
-        mock_add_dependency(u1, u2);
-        mock_add_dependency(u2, u3);
+        mock_add_edge(u0, u1);
+        mock_add_edge(u1, u2);
+        mock_add_edge(u2, u3);
 
         /* Intentionally omit u0 */
@@ -172 +172 @@
          *          \-> u3
          */
-        mock_add_dependency(u0, u1);
-        mock_add_dependency(u1, u2);
-        mock_add_dependency(u1, u3);
+        mock_add_edge(u0, u1);
+        mock_add_edge(u1, u2);
+        mock_add_edge(u1, u3);
 
         job_t *main_job = job_create(u1, STATE_STARTED);
@@ -204 +204 @@
          *          \-> u3
          */
-        mock_add_dependency(u0, u1);
-        mock_add_dependency(u1, u2);
-        mock_add_dependency(u1, u3);
-        mock_add_dependency(u2, u3);
+        mock_add_edge(u0, u1);
+        mock_add_edge(u1, u2);
+        mock_add_edge(u1, u3);
+        mock_add_edge(u2, u3);
 
         job_t *main_job = job_create(u1, STATE_STARTED);

uspace/srv/sysman/test/job_queue.c

@@ -131 +131 @@
 
         /* All services require root fs */
-        mock_add_dependency(s0, m0);
-        mock_add_dependency(s1, m0);
+        mock_add_edge(s0, m0);
+        mock_add_edge(s1, m0);
         
         /* S1 requires another mount and S0 */
-        mock_add_dependency(s1, s0);
+        mock_add_edge(s1, s0);
 
         /* Enforce initial state */

uspace/srv/sysman/test/mock_unit.c

@@ -29 +29 @@
 #include <assert.h>
 
-#include "../dep.h"
+#include "../edge.h"
 
 #include "mock_unit.h"
@@ -76 +76 @@
 }
 
-void mock_add_dependency(unit_t *dependant, unit_t *dependency)
+void mock_add_edge(unit_t *input, unit_t *output)
 {
-        int rc = dep_add_dependency(dependant, dependency);
+        int rc = edge_connect(input, output);
         assert(rc == EOK);
 
-        link_t *link = list_last(&dependant->dependencies);
-        unit_dependency_t *dep =
-            list_get_instance(link, unit_dependency_t, dependencies);
-        dep->state = DEP_VALID;
+        link_t *link = list_last(&input->edges_out);
+        unit_edge_t *e =
+            list_get_instance(link, unit_edge_t, edges_out);
+        e->commited = true;
 }
 

uspace/srv/sysman/test/mock_unit.h

@@ -46 +46 @@
 
 extern void mock_set_units_state(unit_state_t state);
-extern void mock_add_dependency(unit_t *dependant, unit_t *dependency);
+extern void mock_add_edge(unit_t *, unit_t *);
 
 extern int mock_unit_vmt_start_sync(unit_t *);