Changeset 4224ef7 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2019-08-06T18:18:37Z (5 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

File:

• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -137 +137 @@
         while (true) {
                 fs_handle = fs_name_to_handle(instance, fsname, false);
+                if (!fs_handle) {
+                        if ((flags & IPC_FLAG_AUTOSTART)) {
+                                /*
+                                 * Temporarily release the lock, we don't need it while
+                                 * waiting for start request (which may lead to deadlock).
+                                 */
+                                fibril_mutex_unlock(&fs_list_lock);
+                                rc = vfs_fs_request_start(fs_name, instance);
+                                fibril_mutex_lock(&fs_list_lock);
+
+                                if (rc != EOK) {
+                                        fibril_mutex_unlock(&fs_list_lock);
+                                        async_answer_0(callid, rc);
+                                        async_answer_0(rid, rc);
+                                        free(mp);
+                                        free(fs_name);
+                                        free(opts);
+                                        return;
+                                }
+                                /*
+                                 * Succesful start request, new server should be
+                                 * registered.
+                                 */
+                                continue;
+                        }
+                }
 
                 if (fs_handle != 0 || !(flags & VFS_MOUNT_BLOCKING))
@@ -188 +214 @@
 
         return EOK;
+}
+
+static int vfs_fs_request_start(const char *fs_name, unsigned int instance)
+{
+        char *unit_name = NULL;
+
+        assert(instance == 0);
+        /*
+         * Unit name is made simply by considering service of the same name as
+         * given FS name.
+         * TODO instance identifier is not implemented.
+         */
+        asprintf(&unit_name, "%s%c%s", fs_name, UNIT_NAME_SEPARATOR,
+            UNIT_SVC_TYPE_NAME);
+        if (unit_name == NULL) {
+                return ENOMEM;
+        }
+
+        int rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
+
+        free(unit_name);
+        return rc;
 }