Changeset 6efec7e3 in mainline

Timestamp:

2019-08-03T07:38:34Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

59ba708

Parents:

4fe7fcb

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-03-17 19:54:13)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 07:38:34)

Message:

Unit polymorphism (simple mount), debug logging

Location:

uspace/srv/sysman

Files:

• Makefile (modified) (2 diffs)
• configuration.c (modified) (3 diffs)
• job.c (modified) (2 diffs)
• job.h (modified) (1 diff)
• log.h (added)
• main.c (modified) (4 diffs)
• unit.c (modified) (5 diffs)
• unit.h (modified) (3 diffs)
• unit_types.h (added)
• units/unit_cfg.c (added)
• units/unit_cfg.h (moved) (moved from uspace/srv/sysman/unit_cfg.h ) (2 diffs)
• units/unit_mnt.c (added)
• units/unit_mnt.h (moved) (moved from uspace/srv/sysman/unit_mnt.h ) (2 diffs)
• units/unit_tgt.c (added)
• units/unit_tgt.h (added)

uspace/srv/sysman/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
+EXTRA_CFLAGS = -I. -I./units
 BINARY = sysman
 STATIC_NEEDED = y
@@ -38 +39 @@
         main.c \
         sysman.c \
-        unit.c
+        unit.c \
+        units/unit_cfg.c \
+        units/unit_mnt.c  \
+        units/unit_tgt.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/sysman/configuration.c

@@ -5 +5 @@
 
 #include "configuration.h"
+#include "log.h"
 
 static list_t units;
@@ -17 +18 @@
 int configuration_add_unit(unit_t *unit)
 {
+        sysman_log(LVL_DEBUG2, "%s(%p)", __func__, unit);
         assert(unit);
         assert(unit->state == STATE_EMBRYO);
@@ -31 +33 @@
 int configuration_commit(void)
 {
+        sysman_log(LVL_DEBUG2, "%s", __func__);
+
         fibril_mutex_lock(&units_mtx);
         list_foreach(units, units, unit_t, u) {

uspace/srv/sysman/job.c

@@ -8 +8 @@
 
 #include "job.h"
+#include "log.h"
 #include "unit.h"
 
@@ -19 +20 @@
 static int job_run_start(job_t *job)
 {
+        sysman_log(LVL_DEBUG, "%s(%p)", __func__, job);
         unit_t *unit = job->unit;
 

uspace/srv/sysman/job.h

@@ -25 +25 @@
 } job_link_t;
 
+/** Job represents pending or running operation on unit */
 struct job {
         /** Link to queue job is in */

uspace/srv/sysman/main.c

@@ -4 +4 @@
 #include <stddef.h>
 #include <stdio.h>
+#include <str.h>
 
 #include "configuration.h"
@@ -21 +22 @@
         /*
          * Build hard coded configuration.
+         *
+         * Strings are allocated on heap, so that they can be free'd by an
+         * owning unit.
          */
         int result = EOK;
@@ -33 +37 @@
         }
         // TODO Use RDFMT
-        mnt_initrd->data.mnt.type       = "ext4fs";
-        mnt_initrd->data.mnt.mountpoint = "/";
-        mnt_initrd->data.mnt.device     = "bd/initrd";
+        mnt_initrd->data.mnt.type       = str_dup("ext4fs");
+        mnt_initrd->data.mnt.mountpoint = str_dup("/");
+        mnt_initrd->data.mnt.device     = str_dup("bd/initrd");
 
         cfg_init = unit_create(UNIT_CONFIGURATION);
@@ -42 +46 @@
                 goto fail;
         }
-        cfg_init->data.cfg.path = "/cfg/";
+        cfg_init->data.cfg.path = str_dup("/cfg/");
         
         tgt_default = unit_create(UNIT_TARGET);

uspace/srv/sysman/unit.c

@@ -6 +6 @@
 #include <stdlib.h>
 
+#include "log.h"
 #include "unit.h"
+
+/** Virtual method table for each unit type */
+static unit_ops_t *unit_type_vmts[] = {
+        [UNIT_TARGET]        = &unit_tgt_ops,
+        [UNIT_MOUNT]         = &unit_mnt_ops,
+        [UNIT_CONFIGURATION] = &unit_cfg_ops
+};
 
 static void unit_init(unit_t *unit, unit_type_t type)
@@ -12 +20 @@
         assert(unit);
 
+        memset(unit, 0, sizeof(unit_t));
         link_initialize(&unit->units);
         
@@ -21 +30 @@
         list_initialize(&unit->dependants);
         list_initialize(&unit->dependencies);
+
+        unit_type_vmts[unit->type]->init(unit);
 }
 
@@ -33 +44 @@
 
 /** Release resources used by unit structure */
-void unit_destroy(unit_t **unit)
+void unit_destroy(unit_t **unit_ptr)
 {
-        if (*unit == NULL)
+        unit_t *unit = *unit_ptr;
+        if (unit == NULL)
                 return;
+
+        unit_type_vmts[unit->type]->destroy(unit);
         /* TODO:
          *      edges,
-         *      specific unit data,
          *      check it's not an active unit,
          *      other resources to come
          */
-        free(*unit);
-        *unit = NULL;
+        free(unit);
+        unit_ptr = NULL;
+}
+
+void unit_set_state(unit_t *unit, unit_state_t state)
+{
+        fibril_mutex_lock(&unit->state_mtx);
+        unit->state = state;
+        fibril_condvar_broadcast(&unit->state_cv);
+        fibril_mutex_unlock(&unit->state_mtx);
 }
 
@@ -54 +75 @@
 int unit_start(unit_t *unit)
 {
-        // TODO actually start the unit
-        printf("Starting unit of type %i\n", unit->type);
-        return EOK;
+        sysman_log(LVL_DEBUG, "%s(%p)", __func__, unit);
+        return unit_type_vmts[unit->type]->start(unit);
 }

uspace/srv/sysman/unit.h

@@ -7 +7 @@
 #include "unit_mnt.h"
 #include "unit_cfg.h"
+#include "unit_tgt.h"
+#include "unit_types.h"
 
-typedef enum {
-        UNIT_TARGET = 0,
-        UNIT_MOUNT,
-        UNIT_CONFIGURATION
-} unit_type_t;
-
-typedef enum {
-        STATE_EMBRYO = 0,
-        STATE_STARTED,
-        STATE_STOPPED
-} unit_state_t;
-
-typedef struct {
+struct unit {
         link_t units;
 
@@ -36 +26 @@
                 unit_cfg_t cfg;
         } data;
-} unit_t;
+};
 
 
@@ -42 +32 @@
 extern void unit_destroy(unit_t **);
 
+// TODO add flags argument with explicit notification?
+extern void unit_set_state(unit_t *, unit_state_t);
+
 extern int unit_start(unit_t *);
 

uspace/srv/sysman/units/unit_cfg.h

@@ -1 +1 @@
 #ifndef SYSMAN_UNIT_CFG_H
 #define SYSMAN_UNIT_CFG_H
+
+#include "unit_types.h"
 
 typedef struct {
@@ -6 +8 @@
 } unit_cfg_t;
 
+extern unit_ops_t unit_cfg_ops;
+
 #endif

uspace/srv/sysman/units/unit_mnt.h

@@ -1 +1 @@
 #ifndef SYSMAN_UNIT_MNT_H
 #define SYSMAN_UNIT_MNT_H
+
+#include "unit_types.h"
 
 typedef struct {
@@ -8 +10 @@
 } unit_mnt_t;
 
+extern unit_ops_t unit_mnt_ops;
+
+
 #endif