Changeset bb154c6 in mainline for uspace/srv/sysman/units/unit_mnt.c

Timestamp:

2019-08-03T08:15:25Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

09a8006

Parents:

6006f35

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-04-15 15:14:58)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 08:15:25)

Message:

Add skeleton for configuration files loading

• Create content of /cfg directory,
• create sample configuration file,
• refactored polymorphism.

Conflicts:

boot/Makefile

File:

• uspace/srv/sysman/units/unit_mnt.c (modified) (3 diffs)

uspace/srv/sysman/units/unit_mnt.c

@@ -7 +7 @@
 #include "log.h"
 #include "unit.h"
-#include "unit_mnt.h"
+
+static const char *section_name = "Mount";
+
+static config_item_t unit_configuration[] = {
+        {"What",  &config_parse_string, offsetof(unit_mnt_t, device),     NULL},
+        {"Where", &config_parse_string, offsetof(unit_mnt_t, mountpoint), NULL},
+        {"Type",  &config_parse_string, offsetof(unit_mnt_t, type),       NULL},
+        CONFIGURATION_ITEM_SENTINEL
+};
 
 static void unit_mnt_init(unit_t *unit)
 {
-        assert(unit->data.mnt.type == NULL);
-        assert(unit->data.mnt.mountpoint == NULL);
-        assert(unit->data.mnt.device == NULL);
+        unit_mnt_t *u_mnt = CAST_MNT(unit);
+        assert(u_mnt);
+
+        u_mnt->type = NULL;
+        u_mnt->mountpoint = NULL;
+        u_mnt->device = NULL;
+}
+
+static void unit_mnt_destroy(unit_t *unit)
+{
+        assert(unit->type == UNIT_MOUNT);
+        unit_mnt_t *u_mnt = CAST_MNT(unit);
+
+        sysman_log(LVL_DEBUG2, "%s, %p, %p, %p", __func__,
+            u_mnt->type, u_mnt->mountpoint, u_mnt->device);
+        free(u_mnt->type);
+        free(u_mnt->mountpoint);
+        free(u_mnt->device);
+}
+
+static int unit_mnt_load(unit_t *unit, ini_configuration_t *ini_conf,
+    text_parse_t *text_parse)
+{
+        unit_mnt_t *u_mnt = CAST_MNT(unit);
+        assert(u_mnt);
+
+        ini_section_t *section = ini_get_section(ini_conf, section_name);
+        if (section == NULL) {
+                sysman_log(LVL_ERROR,
+                    "Expected section '%s' in configuration of unit '%s'",
+                    section_name, unit_name(unit));
+                return ENOENT;
+        }
+
+        return config_load_ini_section(unit_configuration, section, u_mnt,
+            text_parse);
 }
 
 static int unit_mnt_start(unit_t *unit)
 {
+        unit_mnt_t *u_mnt = CAST_MNT(unit);
+        assert(u_mnt);
+
         fibril_mutex_lock(&unit->state_mtx);
         
@@ -28 +72 @@
 
 
-        unit_mnt_t *data = &unit->data.mnt;
-
         // TODO use other mount parameters
-        int rc = mount(data->type, data->mountpoint, data->device, "",
+        int rc = mount(u_mnt->type, u_mnt->mountpoint, u_mnt->device, "",
             IPC_FLAG_BLOCKING, 0);
 
         if (rc == EOK) {
-                sysman_log(LVL_NOTE, "Mount (%p) mounted", unit);
+                sysman_log(LVL_NOTE, "Mount ('%s') mounted", unit_name(unit));
                 unit_set_state(unit, STATE_STARTED);
         } else {
-                sysman_log(LVL_ERROR, "Mount (%p) failed (%i)", unit, rc);
+                sysman_log(LVL_ERROR, "Mount ('%s') failed (%i)",
+                    unit_name(unit), rc);
                 unit_set_state(unit, STATE_FAILED);
         }
@@ -45 +88 @@
 }
 
-static void unit_mnt_destroy(unit_t *unit)
-{
-        free(unit->data.mnt.type);
-        free(unit->data.mnt.mountpoint);
-        free(unit->data.mnt.device);
-}
+DEFINE_UNIT_VMT(unit_mnt)
 
-
-DEFINE_UNIT_OPS(unit_mnt)
-