Changeset 63a3276 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2019-08-06T19:20:35Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

3f05ef7

Parents:

72c8f77

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-06-17 23:02:03)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-06 19:20:35)

Message:

sysman: Instrumented locsrv for autostart

• also refactored unit name derivation in other brokers
• exposee creation is not used in unit's lifecycle (failed assertion)

Conflicts:

uspace/lib/c/generic/loc.c
uspace/srv/devman/driver.c
uspace/srv/devman/drv_conn.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/locsrv/locsrv.c
uspace/srv/vfs/vfs.h
uspace/srv/vfs/vfs_ops.c
uspace/srv/vfs/vfs_register.c

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -136 +136 @@
         fibril_mutex_lock(&fs_list_lock);
         while (true) {
-                fs_handle = fs_name_to_handle(instance, fsname, false);
+                fs_handle = fs_name_to_handle(fsname, instance, false);
                 if (!fs_handle) {
                         if ((flags & IPC_FLAG_AUTOSTART)) {
@@ -220 +220 @@
         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);
+        errno_t rc = fs_unit_name(fs_name, instance, &unit_name);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
 
         free(unit_name);
@@ -246 +239 @@
 
         fibril_mutex_lock(&fs_list_lock);
-        fs_handle = fs_name_to_handle(0, fs_name, false);
+        fs_handle = fs_name_to_handle(fs_name, 0, false);
         fibril_mutex_unlock(&fs_list_lock);