Changeset aa0faeca in mainline for uspace/srv/sysman/unit.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/unit.c (modified) (6 diffs)

uspace/srv/sysman/unit.c

@@ -56 +56 @@
 static config_item_t unit_configuration[] = {
         { "After", &unit_parse_unit_list, 0, "" },
+        { "ConditionArchitecture", &unit_parse_condition_architecture, 0, "" },
         CONFIGURATION_ITEM_SENTINEL
 };
@@ -69 +70 @@
         unit->state = STATE_STOPPED;
         unit->repo_state = REPO_EMBRYO;
+        unit->conditions = UNIT_CONDITION_NONE;
 
         link_initialize(&unit->units);
@@ -137 +139 @@
 errno_t unit_start(unit_t *unit)
 {
+        assert(unit->conditions == UNIT_CONDITION_NONE);
         sysman_log(LVL_NOTE, "%s('%s')", __func__, unit_name(unit));
         return UNIT_VMT(unit)->start(unit);
@@ -147 +150 @@
 errno_t unit_stop(unit_t *unit)
 {
+        assert(unit->conditions == UNIT_CONDITION_NONE);
         sysman_log(LVL_NOTE, "%s('%s')", __func__, unit_name(unit));
         return UNIT_VMT(unit)->stop(unit);
@@ -191 +195 @@
 {
         return unit->name ? unit->name : "";
+}
+
+/**
+ * Logs a message for the failed conditions of a unit
+ */
+void unit_log_condition(unit_t *unit)
+{
+        assert(unit->conditions != UNIT_CONDITION_NONE);
+        unit_condition_t conditions = unit->conditions;
+        while (conditions != UNIT_CONDITION_NONE) {
+                const char *type = NULL;
+                if (conditions & UNIT_CONDITION_ARCHITECTURE) {
+                        conditions ^= UNIT_CONDITION_ARCHITECTURE;
+                        type = "architecture";
+                } else {
+                        sysman_log(
+                            LVL_NOTE,
+                            "Condition restriction: unit '%s' does not meet the unkown condition '%d'",
+                            unit_name(unit),
+                            conditions);
+                        return;
+                }
+
+                sysman_log(
+                    LVL_NOTE,
+                    "Condition restriction: unit '%s' does not meet the '%s' condition",
+                    unit_name(unit),
+                    type);
+        }
 }
 
@@ -221 +254 @@
         return result;
 }
+
+bool unit_parse_condition_architecture(const char *string, void *dst, text_parse_t *parse,
+    size_t lineno)
+{
+        unit_t *unit = dst;
+        bool result = true;
+        char *str = NULL;
+
+        if (str_length(string) == 0) {
+                goto finish;
+        }
+
+        str = str_dup(string);
+        if (str == NULL) {
+                result = false;
+                goto finish;
+        }
+
+        char *split = str;
+        char *tok;
+        bool conditions = false;
+        while ((tok = str_tok(split, " ", &split))) {
+                if (str_casecmp(tok, STRING(UARCH)) == 0) {
+                        conditions = true;
+                        break;
+                }
+        }
+
+        if (!conditions) {
+                unit->conditions |= UNIT_CONDITION_ARCHITECTURE;
+        }
+
+finish:
+        free(str);
+        return result;
+}