Changeset 63a3276 in mainline for uspace/srv/vfs

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

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_ops.c (modified) (3 diffs)
• vfs_register.c (modified) (6 diffs)

uspace/srv/vfs/vfs.h

@@ -176 +176 @@
 extern void vfs_exchange_release(async_exch_t *);
 
-extern fs_handle_t fs_name_to_handle(unsigned int instance, const char *, bool);
+extern fs_handle_t fs_name_to_handle(const char *, unsigned int instance, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
-extern errno_t vfs_get_fstypes(vfs_fstypes_t *);
+extern errno_t fs_unit_name(const char *, unsigned int, char **);
 
 extern errno_t vfs_lookup_internal(vfs_node_t *, char *, int, vfs_lookup_res_t *);

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

uspace/srv/vfs/vfs_register.c

@@ -36 +36 @@
  */
 
-#include <ipc/services.h>
+#include <adt/list.h>
+#include <as.h>
+#include <assert.h>
 #include <async.h>
+#include <atomic.h>
+#include <ctype.h>
+#include <errno.h>
 #include <fibril.h>
 #include <fibril_synch.h>
-#include <errno.h>
+#include <ipc/services.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
-#include <ctype.h>
-#include <stdbool.h>
-#include <adt/list.h>
-#include <as.h>
-#include <assert.h>
-#include <stdatomic.h>
-#include <vfs/vfs.h>
+#include <sysman/broker.h>
 #include "vfs.h"
 
@@ -149 +149 @@
          * Check for duplicit registrations.
          */
-        if (fs_name_to_handle(fs_info->vfs_info.instance,
-            fs_info->vfs_info.name, false)) {
+        if (fs_name_to_handle(fs_info->vfs_info.name,
+            fs_info->vfs_info.instance, false)) {
                 /*
                  * We already register a fs like this.
@@ -161 +161 @@
         }
 
+        /* Notify sysman about started FS server */
+        char *unit_name = NULL;
+        rc = fs_unit_name(fs_info->vfs_info.name, fs_info->vfs_info.instance,
+            &unit_name);
+        if (rc != EOK) {
+                dprintf("Unknow unit name for FS server.\n");
+                fibril_mutex_unlock(&fs_list_lock);
+                free(fs_info);
+                async_answer_0(rid, rc);
+                return;
+        }
+        sysman_main_exposee_added(unit_name, request->in_task_id);
+        free(unit_name);
+        
         /*
          * Add fs_info to the list of registered FS's.
@@ -288 +302 @@
  *
  * @param name File system name.
+ * @param instance
  * @param lock If true, the function will lock and unlock the
  *             fs_list_lock.
@@ -294 +309 @@
  *
  */
-fs_handle_t fs_name_to_handle(unsigned int instance, const char *name, bool lock)
+fs_handle_t fs_name_to_handle(const char *name, unsigned int instance, bool lock)
 {
         int handle = 0;
@@ -393 +408 @@
 }
 
+/** Get name of unit that represents the filesystem server
+ *
+ * Unit name is made simply by considering service of the same name as
+ * given FS name.
+ * TODO instance identifier is not implemented.
+ *
+ * @param[in]  fs_name
+ * @param[in]  instance
+ * @param[out] unit_name_ptr  should be free'd after use, not touched on fail
+ *
+ * @return     EOK on success
+ * @return     ENOMEM
+ */
+errno_t fs_unit_name(const char *fs_name, unsigned int instance,
+    char **unit_name_ptr)
+{
+        assert(instance == 0);
+
+        char *unit_name = NULL;
+        asprintf(&unit_name, "%s%c%s", fs_name, UNIT_NAME_SEPARATOR,
+            UNIT_SVC_TYPE_NAME);
+
+        if (unit_name == NULL) {
+                return ENOMEM;
+        } else {
+                *unit_name_ptr = unit_name;
+                return EOK;
+        }
+}
+
 /**
  * @}