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

Timestamp:

2020-03-08T16:47:18Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

a73aaec1

Parents:

13b4504

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-03-06 18:10:45)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-03-08 16:47:18)

Message:

Adding "ConditionArchitecture" to sysman's unit

the services s3c24xx_uart and s3c24xx_ts are specific for
arm32. This newly flag allows sysman to ignore those units
when they are asked to be loaded

File:

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

uspace/srv/sysman/repo.c

@@ -278 +278 @@
 }
 
+static bool repo_clean_up_unit(ht_link_t *ht_link, void *arg)
+{
+        unit_t *unit = hash_table_get_inst(ht_link, unit_t, units_by_name);
+
+        if (unit->conditions != UNIT_CONDITION_NONE) {
+                unit_log_condition(unit);
+
+                list_foreach_safe(unit->edges_in, current_link, iter) {
+                        unit_edge_t *e = list_get_instance(current_link, unit_edge_t, edges_in);
+                        edge_remove(&e);
+                }
+
+                list_foreach_safe(unit->edges_out, current_link, iter) {
+                        unit_edge_t *e = list_get_instance(current_link, unit_edge_t, edges_out);
+                        edge_remove(&e);
+                }
+        }
+
+        return true;
+}
+
 /** Resolve unresolved dependencies between any pair of units_by_name
  *
@@ -289 +310 @@
         bool has_error = false;
         hash_table_apply(&units_by_name, &repo_resolve_unit, &has_error);
+
+        if (!has_error) {
+                //once all references have been built test if there are
+                //units which dont meet the conditions. If yes, remove the edges
+                hash_table_apply(&units_by_name, &repo_clean_up_unit, &has_error);
+        }
 
         return has_error ? ENOENT : EOK;