Changeset e8747bd8 in mainline

Timestamp:

2019-08-07T09:20:54Z (5 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

Location:

uspace/srv

Files:

• logger/main.c (modified) (1 diff)
• sysman/Makefile (modified) (1 diff)
• sysman/configuration.c (modified) (1 diff)
• sysman/connection_ctl.c (modified) (1 diff)
• sysman/main.c (modified) (3 diffs)
• sysman/sm_task.c (added)
• sysman/sm_task.h (added)
• sysman/sysman.c (modified) (3 diffs)
• sysman/sysman.h (modified) (1 diff)
• sysman/units/unit_svc.c (modified) (3 diffs)
• sysman/units/unit_svc.h (modified) (2 diffs)

uspace/srv/logger/main.c

@@ -83 +83 @@
 
         printf("%s: Accepting connections\n", NAME);
+
+        task_retval(EOK);
         async_manager();
 

uspace/srv/sysman/Makefile

@@ -50 +50 @@
         units/unit_tgt.c \
         units/unit_svc.c \
+        sm_task.c \
         util.c
 

uspace/srv/sysman/configuration.c

@@ -38 +38 @@
 #include "log.h"
 
+// TODO rename to repository (dynamic nature of units storage, and do not name it godlike Manager :-)
+
 LIST_INITIALIZE(units);
 

uspace/srv/sysman/connection_ctl.c

@@ -38 +38 @@
 
 
+// TODO possibly provide as type-safe function + macro in sysman.h for generic boxing
 static ipc_callid_t *box_callid(ipc_callid_t iid)
 {

uspace/srv/sysman/main.c

@@ -44 +44 @@
 #include "log.h"
 #include "sysman.h"
+#include "sm_task.h"
 #include "unit.h"
 
@@ -208 +209 @@
          * Initialize global structures
          */
+        // TODO check return values and abort start
         configuration_init();
         sysman_events_init();
         job_queue_init();
+        sm_task_init();
 
         /*
@@ -230 +233 @@
 
         sysman_log(LVL_DEBUG, "Debugging pause...\n");
-        async_usleep(10 * 1000000);
+        async_usleep(1 * 1000000);
+        sysman_log(LVL_DEBUG, "Debugging pause ended.\n");
         /* Queue first job from sequence */
         prepare_and_run_job(&target_sequence[0]);

uspace/srv/sysman/sysman.c

@@ -35 +35 @@
 #include "log.h"
 #include "sysman.h"
+#include "task.h"
 #include "unit.h"
 
@@ -401 +402 @@
 void sysman_event_unit_exposee_created(void *data)
 {
-        unit_t *unit = data;
-        unit_exposee_created(unit);
+        unit_exposee_created(data);
 }
 
 void sysman_event_unit_failed(void *data)
 {
-        unit_t *unit = data;
-        unit_fail(unit);
+        unit_fail(data);
 }
 
@@ -415 +414 @@
         notify_observers(data);
 }
+

uspace/srv/sysman/sysman.h

@@ -47 +47 @@
 extern size_t sysman_observers_count(void *);
 
+// TODO move particular events to separate file? (or move event impl there?)
 
 extern void sysman_event_job_process(void *);

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);
 }
 

uspace/srv/sysman/units/unit_svc.h

@@ -30 +30 @@
 #define SYSMAN_UNIT_SVC_H
 
+#include <task.h>
+
 #include "unit.h"
 #include "util.h"
@@ -37 +39 @@
 
         command_t exec_start;
+
+        task_id_t main_task_id;
 } unit_svc_t;