Changeset 5559712 in mainline for uspace/srv/sysman/sysman.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/sysman.c (modified) (5 diffs)

uspace/srv/sysman/sysman.c

@@ -35 +35 @@
 #include "log.h"
 #include "sysman.h"
+#include "unit.h"
 
 
@@ -150 +151 @@
 
                 /* Process event */
-                sysman_log(LVL_DEBUG2, "process(%p, %p)", event->handler, event->data);
+                sysman_log(LVL_DEBUG2, "process_event(%p, %p)",
+                    event->handler, event->data);
                 event->handler(event->data);
                 free(event);
         }
+}
+
+/** Create and queue job for unit
+ *
+ * @param[in]  callback  callback must explicitly delete reference to job
+ */
+int sysman_queue_job(unit_t *unit, unit_state_t target_state,
+    callback_handler_t callback, void *callback_arg)
+{
+        job_t *job = job_create(unit, target_state);
+        if (job == NULL) {
+                return ENOMEM;
+        }
+
+        job_add_ref(job);
+        sysman_object_observer(job, callback, callback_arg);
+
+        job_add_ref(job);
+        sysman_raise_event(&sysman_event_job_process, job);
+
+        job_del_ref(&job);
+        return EOK;
 }
 
@@ -226 +250 @@
 
 // NOTE must run in main event loop fibril
-void sysman_event_job_process(void *arg)
-{
-        job_t *job = arg;
+void sysman_event_job_process(void *data)
+{
+        job_t *job = data;
         dyn_array_t job_closure;
         dyn_array_initialize(&job_closure, job_ptr_t, 0);
@@ -250 +274 @@
         job_del_ref(&job);
 
-        // TODO explain why calling asynchronously
-        sysman_raise_event(&sysman_event_job_queue_run, NULL);
+        job_queue_process();
         return;
 
@@ -265 +288 @@
 }
 
-
-void sysman_event_job_queue_run(void *unused)
-{
-        job_t *job;
-        while ((job = job_queue_pop_runnable())) {
-                job_run(job);
-                job_del_ref(&job);
-        }
-}
-
-void sysman_event_job_changed(void *object)
-{
-        notify_observers(object);
+void sysman_event_job_finished(void *data)
+{
+        notify_observers(data);
         /* Unreference the event data */
-        job_t *job = object;
+        job_t *job = data;
         job_del_ref(&job);
-}
+
+        /* The finished job, might have been blocking */
+        job_queue_process();
+}
+
+void sysman_event_unit_exposee_created(void *data)
+{
+        unit_t *unit = data;
+        unit_exposee_created(unit);
+}
+
+void sysman_event_unit_failed(void *data)
+{
+        unit_t *unit = data;
+        unit_fail(unit);
+}
+
+void sysman_event_unit_state_changed(void *data)
+{
+        notify_observers(data);
+}