Changeset 9532981 in mainline for uspace/srv/sysman/repo.c

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)

File:

• uspace/srv/sysman/repo.c (modified) (5 diffs)

uspace/srv/sysman/repo.c

@@ -35 +35 @@
 
 #include "repo.h"
-#include "dep.h"
+#include "edge.h"
 #include "log.h"
 
@@ -148 +148 @@
 {
         unit_t *unit = hash_table_get_inst(ht_link, unit_t, units_by_name);
-        // TODO state locking?
         if (unit->state == STATE_EMBRYO) {
                 unit->state = STATE_STOPPED;
         }
 
-        list_foreach(unit->dependencies, dependencies, unit_dependency_t, dep) {
-                if (dep->state == DEP_EMBRYO) {
-                        dep->state = DEP_VALID;
-                }
+        list_foreach(unit->edges_out, edges_out, unit_edge_t, e) {
+                e->commited = true;
         }
         return true;
@@ -177 +174 @@
         unit_t *unit = hash_table_get_inst(ht_link, unit_t, units_by_name);
 
-        list_foreach_safe(unit->dependencies, cur_link, next_link) {
-                unit_dependency_t *dep =
-                    list_get_instance(cur_link, unit_dependency_t, dependencies);
-                if (dep->state == DEP_EMBRYO) {
-                        dep_remove_dependency(&dep);
+        list_foreach_safe(unit->edges_out, cur_link, next_link) {
+                unit_edge_t *e =
+                    list_get_instance(cur_link, unit_edge_t, edges_out);
+                if (!e->commited) {
+                        edge_remove(&e);
                 }
         }
@@ -210 +207 @@
         unit_t *unit = hash_table_get_inst(ht_link, unit_t, units_by_name);
 
-        list_foreach(unit->dependencies, dependencies, unit_dependency_t, dep) {
-                assert(dep->dependant == unit);
-                assert((dep->dependency != NULL) != (dep->dependency_name != NULL));
-                if (dep->dependency) {
+        list_foreach(unit->edges_out, edges_out, unit_edge_t, e) {
+                assert(e->input == unit);
+                assert((e->output != NULL) != (e->output_name != NULL));
+                if (e->output) {
                         continue;
                 }
 
-                unit_t *dependency =
-                    repo_find_unit_by_name(dep->dependency_name);
-                if (dependency == NULL) {
+                unit_t *output =
+                    repo_find_unit_by_name(e->output_name);
+                if (output == NULL) {
                         sysman_log(LVL_ERROR,
                             "Cannot resolve dependency of '%s' to unit '%s'",
-                            unit_name(unit), dep->dependency_name);
+                            unit_name(unit), e->output_name);
                         *has_error_ptr = true;
                         // TODO should we just leave the sprout untouched?
                 } else {
-                        dep_resolve_dependency(dep, dependency);
+                        edge_resolve_output(e, output);
                 }
         }
@@ -238 +235 @@
  * @return ENOENT  when one or more resolution fails, information is logged
  */
-int repo_resolve_dependecies(void)
+int repo_resolve_references(void)
 {
         sysman_log(LVL_DEBUG2, "%s", __func__);