Changeset 5559712 in mainline for uspace/srv/sysman/unit.c

Timestamp:

2019-08-03T09:28:50Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

c0e4fc50

Parents:

2dda1d4

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-07 11:49:47)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:28:50)

Message:

sysman: Naive autostart instrumentation of locsrv

• Add IPC_FLAG_AUTOSTART flag.
• libsysman: sysman's broker and control API.
• Simple implementation of service unit, exposee verification is missing.
• Simple mapping of exposee to unit name in locsrv.
• Temporary debug prints in locsrv.

Conflicts:

boot/Makefile.common
boot/arch/amd64/Makefile.inc
uspace/lib/c/include/ipc/services.h
uspace/srv/locsrv/locsrv.c

File:

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

uspace/srv/sysman/unit.c

@@ -37 +37 @@
 #include <stdlib.h>
 #include <str.h>
+#include <sysman/unit.h>
 
 #include "dep.h"
 #include "log.h"
+#include "sysman.h"
 #include "unit.h"
 
 /** Virtual method table for each unit type */
 unit_vmt_t *unit_type_vmts[] = {
-        [UNIT_TARGET]        = &unit_tgt_ops,
-        [UNIT_MOUNT]         = &unit_mnt_ops,
-        [UNIT_CONFIGURATION] = &unit_cfg_ops
+        [UNIT_CONFIGURATION] = &unit_cfg_vmt,
+        [UNIT_MOUNT]         = &unit_mnt_vmt,
+        [UNIT_TARGET]        = &unit_tgt_vmt,
+        [UNIT_SERVICE]       = &unit_svc_vmt
 };
 
@@ -61 +64 @@
         assert(unit);
 
-        // TODO is this necessary?
-        memset(unit, 0, sizeof(unit_t));
+        size_t size = unit_type_vmts[type]->size;
+        memset(unit, 0, size);
         
         unit->type = type;
-        unit->name = NULL;
-
         unit->state = STATE_EMBRYO;
 
@@ -103 +104 @@
 }
 
-
-/** Issue request to restarter to start a unit
- *
- * Ideally this function is non-blocking synchronous, however, some units
- * cannot be started synchronously and thus return from this function generally
- * means that start was requested.
- *
- * Check state of the unit for actual result, start method can end in states:
- *   - STATE_STARTED, (succesful synchronous start)
- *   - STATE_STARTING, (succesful asynchronous start request)
- *   - STATE_FAILED.  (error occured)
- */
-int unit_start(unit_t *unit)
-{
-        sysman_log(LVL_DEBUG, "%s('%s')", __func__, unit_name(unit));
-        return UNIT_VMT(unit)->start(unit);
-}
-
 int unit_load(unit_t *unit, ini_configuration_t *ini_conf,
     text_parse_t *text_parse)
@@ -140 +123 @@
 }
 
+/** Issue request to restarter to start a unit
+ *
+ * Ideally this function is non-blocking synchronous, however, some units
+ * cannot be started synchronously and thus return from this function generally
+ * means that start was requested.
+ *
+ * Check state of the unit for actual result, start method can end in states:
+ *   - STATE_STARTED, (succesful synchronous start)
+ *   - STATE_STARTING, (succesful asynchronous start request)
+ *   - STATE_FAILED.  (unit state changed and error occured)
+ */
+int unit_start(unit_t *unit)
+{
+        sysman_log(LVL_DEBUG, "%s('%s')", __func__, unit_name(unit));
+        return UNIT_VMT(unit)->start(unit);
+}
+
+void unit_exposee_created(unit_t *unit)
+{
+        sysman_log(LVL_DEBUG, "%s('%s')", __func__, unit_name(unit));
+        return UNIT_VMT(unit)->exposee_created(unit);
+}
+
+void unit_fail(unit_t *unit)
+{
+        sysman_log(LVL_DEBUG, "%s('%s')", __func__, unit_name(unit));
+        return UNIT_VMT(unit)->fail(unit);
+}
+
+void unit_notify_state(unit_t *unit)
+{
+        sysman_raise_event(&sysman_event_unit_state_changed, unit);
+}
+
 unit_type_t unit_type_name_to_type(const char *type_name)
 {
-        if (str_cmp(type_name, "cfg") == 0)
+        if (str_cmp(type_name, UNIT_CFG_TYPE_NAME) == 0)
                 return UNIT_CONFIGURATION;
 
-        else if (str_cmp(type_name, "mnt") == 0)
+        else if (str_cmp(type_name, UNIT_MNT_TYPE_NAME) == 0)
                 return UNIT_MOUNT;
 
-        else if (str_cmp(type_name, "tgt") == 0)
+        else if (str_cmp(type_name, UNIT_TGT_TYPE_NAME) == 0)
                 return UNIT_TARGET;
+
+        else if (str_cmp(type_name, UNIT_SVC_TYPE_NAME) == 0)
+                return UNIT_SERVICE;
 
         else
@@ -160 +180 @@
         return unit->name ? unit->name : "";
 }
-
-
-
 
 bool unit_parse_unit_list(const char *value, void *dst, text_parse_t *parse,