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

Timestamp:

2019-08-07T09:20:54Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

2df7d824

Parents:

012dd8e

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-01 15:43:57)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 09:20:54)

Message:

sysman: Use taskman API to detect successful server start

Conflicts:

uspace/srv/logger/main.c

File:

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

uspace/srv/sysman/units/unit_svc.c ¶

@@ -85 +85 @@
         assert(unit->state == STATE_STOPPED);
 
-        int rc = task_spawnv(NULL, NULL, u_svc->exec_start.path,
+        int rc = task_spawnv(&u_svc->main_task_id, NULL, u_svc->exec_start.path,
             u_svc->exec_start.argv);
 
@@ -96 +96 @@
 
         /*
-         * This is temporary workaround, until proper reporting from brokers
-         * about exposees will work. We assume the service succesfully starts
-         * in a moment. Applies to naming service only.
-         */
-        if (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.
+         * TODO move to task retval/exposee created handler
          */
         if (str_cmp(unit->name, "devman.svc") == 0) {
@@ -128 +117 @@
         assert(unit->state == STATE_STOPPED || unit->state == STATE_STARTING || unit->state==STATE_STARTED);
 
-        unit->state = STATE_STARTED;
-        unit_notify_state(unit);
+        /* Exposee itself doesn't represent started unit. */
+        //unit->state = STATE_STARTED;
+        //unit_notify_state(unit);
 }