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

Timestamp:

2019-08-03T09:28:50Z (6 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.h (modified) (4 diffs)

uspace/srv/sysman/unit.h

@@ -45 +45 @@
         UNIT_MOUNT,
         UNIT_CONFIGURATION,
+        UNIT_SERVICE
 } unit_type_t;
 
@@ -73 +74 @@
 #include "unit_mnt.h"
 #include "unit_tgt.h"
+#include "unit_svc.h"
 
-#define DEFINE_CAST(NAME, TYPE, ENUM_TYPE)                           \
-        static inline TYPE *CAST_##NAME(unit_t *u)                   \
-        {                                                            \
-                if (u->type == ENUM_TYPE)                            \
-                        return (TYPE *)u;                            \
-                else                                                 \
-                        return NULL;                                 \
-        }                                                            \
+#define DEFINE_CAST(NAME, TYPE, ENUM_TYPE)                                     \
+        static inline TYPE *CAST_##NAME(unit_t *u)                             \
+        {                                                                      \
+                if (u->type == ENUM_TYPE)                                      \
+                        return (TYPE *)u;                                      \
+                else                                                           \
+                        return NULL;                                           \
+        }                                                                      \
 
 DEFINE_CAST(CFG, unit_cfg_t, UNIT_CONFIGURATION)
 DEFINE_CAST(MNT, unit_mnt_t, UNIT_MOUNT)
 DEFINE_CAST(TGT, unit_tgt_t, UNIT_TARGET)
+DEFINE_CAST(SVC, unit_svc_t, UNIT_SERVICE)
 
 struct unit_vmt {
@@ -97 +100 @@
 
         int (*start)(unit_t *);
+
+        void (*exposee_created)(unit_t *);
+
+        void (*fail)(unit_t *);
 };
 
 extern unit_vmt_t *unit_type_vmts[];
 
-#define DEFINE_UNIT_VMT(PREFIX)                                      \
-        unit_vmt_t PREFIX##_ops = {                                  \
-                .size    = sizeof(PREFIX##_t),                       \
-                .init    = &PREFIX##_init,                           \
-                .load    = &PREFIX##_load,                           \
-                .destroy = &PREFIX##_destroy,                        \
-                .start   = &PREFIX##_start                           \
+#define DEFINE_UNIT_VMT(PREFIX)                                                \
+        unit_vmt_t PREFIX##_vmt = {                                            \
+                .size            = sizeof(PREFIX##_t),                         \
+                .init            = &PREFIX##_init,                             \
+                .load            = &PREFIX##_load,                             \
+                .destroy         = &PREFIX##_destroy,                          \
+                .start           = &PREFIX##_start,                            \
+                .exposee_created = &PREFIX##_exposee_created,                  \
+                .fail            = &PREFIX##_fail                              \
         };
 
@@ -115 +124 @@
 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_load(unit_t *, ini_configuration_t *, text_parse_t *);
 extern int unit_start(unit_t *);
+extern void unit_exposee_created(unit_t *);
+extern void unit_fail(unit_t *);
+
+extern void unit_notify_state(unit_t *);
 
 extern unit_type_t unit_type_name_to_type(const char *);