Changeset 63a3276 in mainline for uspace/srv/sysman/units/unit_svc.c

Timestamp:

2019-08-06T19:20:35Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

3f05ef7

Parents:

72c8f77

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-06-17 23:02:03)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 19:20:35)

Message:

sysman: Instrumented locsrv for autostart

• also refactored unit name derivation in other brokers
• exposee creation is not used in unit's lifecycle (failed assertion)

Conflicts:

uspace/lib/c/generic/loc.c
uspace/srv/devman/driver.c
uspace/srv/devman/drv_conn.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/locsrv/locsrv.c
uspace/srv/vfs/vfs.h
uspace/srv/vfs/vfs_ops.c
uspace/srv/vfs/vfs_register.c

File:

• uspace/srv/sysman/units/unit_svc.c (modified) (2 diffs)

uspace/srv/sysman/units/unit_svc.c

@@ -93 +93 @@
         }
 
+        unit->state = STATE_STARTING;
+
         /*
          * This is temporary workaround, until proper reporting from brokers
          * about exposees will work. We assume the service succesfully starts
-         * in a moment.
+         * in a moment. Applies to naming service only.
          */
-        unit->state = STATE_STARTING;
-        async_usleep(20000);
-        unit->state = STATE_STARTED;
+        // TODO this is even hack in the workaround, exposees doesn't work properly
+        if (true || str_cmp(unit->name, "devman.svc") == 0 ||
+            str_cmp(unit->name, "logger.svc") == 0 ||
+            str_cmp(unit->name, "irc.svc") == 0) {
+                async_usleep(100000);
+                unit->state = STATE_STARTED;
+        }
 
         /*
          * Workaround to see log output even after devman starts (and overrides
-         * kernel's frame buffer. It's here since devman is started as a
-         * service (however not all services are devman...).
+         * kernel's frame buffer.
          */
-        if (console_kcon()) {
-                sysman_log(LVL_DEBUG2, "%s: Kconsole grabbed.", __func__);
-        } else {
-                sysman_log(LVL_DEBUG2, "%s: no kconsole.", __func__);
+        if (str_cmp(unit->name, "devman.svc") == 0) {
+                async_usleep(100000);
+                if (console_kcon()) {
+                        sysman_log(LVL_DEBUG2, "%s: Kconsole grabbed.", __func__);
+                } else {
+                        sysman_log(LVL_DEBUG2, "%s: no kconsole.", __func__);
+                }
         }
 
@@ -118 +126 @@
 static void unit_svc_exposee_created(unit_t *unit)
 {
-        // TODO implement
+        assert(CAST_SVC(unit));
+        assert(unit->state == STATE_STOPPED || unit->state == STATE_STARTING || unit->state==STATE_STARTED);
+
+        unit->state = STATE_STARTED;
+        unit_notify_state(unit);
 }