Changeset 4224ef7 in mainline for uspace/srv/sysman

Timestamp:

2019-08-06T18:18:37Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e55741e

Parents:

dd5c623

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-11 16:50:40)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 18:18:37)

Message:

sysman: Add VFS FS server autostart

• VFS autostart instrumentation removes explicit dependency on FS servers.
• Compositor service properly named, it's now resolved as implicit dependency.

Conflicts:

boot/Makefile.common
uspace/lib/gui/window.c
uspace/srv/locsrv/locsrv.c
uspace/srv/vfs/vfs.c
uspace/srv/vfs/vfs_ops.c

Location:

uspace/srv/sysman

Files:

• connection_broker.c (modified) (1 diff)
• sysman.c (modified) (2 diffs)
• units/unit_mnt.c (modified) (1 diff)
• units/unit_svc.c (modified) (1 diff)

uspace/srv/sysman/connection_broker.c

@@ -37 +37 @@
         sysman_log(LVL_DEBUG2, "%s", __func__);
         async_answer_0(iid, EOK);
-        // TODO implement
+        /* TODO implement
+         *  What exactly? Similar behavior that has locsrv with servers,
+         *  so that subsequent calls can be assigned to broker. Still that
+         *  makes sense only when brokers will somehow scope unit/exposee
+         *  names. Why I wanted this registration?
+         */
 }
 

uspace/srv/sysman/sysman.c

@@ -160 +160 @@
 /** Create and queue job for unit
  *
- * @param[in]  callback  callback must explicitly delete reference to job
+ * @param[in]  callback  (optional) callback must explicitly delete reference
+ *                       to job
  */
 int sysman_queue_job(unit_t *unit, unit_state_t target_state,
@@ -170 +171 @@
         }
 
-        job_add_ref(job);
-        sysman_object_observer(job, callback, callback_arg);
+        if (callback != NULL) {
+                job_add_ref(job);
+                sysman_object_observer(job, callback, callback_arg);
+        }
 
         job_add_ref(job);

uspace/srv/sysman/units/unit_mnt.c

@@ -151 +151 @@
 {
         mount_data_t *mnt_data = arg;
-        /*sysman_log(LVL_DEBUG2, "%s(%p, %p, %p, %p, %x, %u)",
+        sysman_log(LVL_DEBUG2, "%s(%p, %p, %p, %p, %x, %u)",
             __func__,
             mnt_data->type, mnt_data->mountpoint, mnt_data->device, mnt_data->options,
-            mnt_data->flags, mnt_data->instance);*/
+            mnt_data->flags, mnt_data->instance);
+
         int rc = mount(mnt_data->type, mnt_data->mountpoint, mnt_data->device,
             mnt_data->options ? mnt_data->options : "",

uspace/srv/sysman/units/unit_svc.c

@@ -87 +87 @@
         int rc = task_spawnv(NULL, NULL, u_svc->exec_start.path,
             u_svc->exec_start.argv);
-        sysman_log(LVL_DEBUG2, "task_spawn(%s, %s)", u_svc->exec_start.path, u_svc->exec_start.argv[0]);
+
         if (rc != EOK) {
                 unit->state = STATE_FAILED;