Changeset 63a3276 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2019-08-06T19:20:35Z (5 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/locsrv/locsrv.c (modified) (5 diffs)

uspace/srv/locsrv/locsrv.c

@@ -64 +64 @@
 } cb_sess_t;
 
+typedef enum {
+        NAME_TO_START,
+        NAME_TO_EXPOSE
+} unit_name_t;
+
 LIST_INITIALIZE(services_list);
 LIST_INITIALIZE(namespaces_list);
@@ -335 +340 @@
 }
 
-static int loc_service_request_start(const char *ns_name, const char *name)
+/** Derive unit name from service name according to purpose
+ *
+ * All services in 'device' namespace are considered to be drivers and
+ * devman is thus requested to start. Otherwise name of unit is made
+ * from fully qualified name of service (namespace separator is changed
+ * for usage in unit name.
+ */
+static int loc_service_unit_name(const char *ns_name, const char *name,
+    unit_name_t name_type, char **unit_name_ptr)
 {
         char *service_name = NULL;
-
-        /*
-         * All services in 'device' namespace are considered to be drivers and
-         * devman is thus requested to start. Otherwise name of unit is made
-         * from fully qualified name of service (namespace separator is changed
-         * for usage in unit name.
-         */
-        if (str_cmp(ns_name, LOC_DEVICE_NAMESPACE) == 0) {
+        if (name_type == NAME_TO_START &&
+            str_cmp(ns_name, LOC_DEVICE_NAMESPACE) == 0) {
                 asprintf(&service_name, "%s", SERVICE_NAME_DEVMAN);
         } else if (str_cmp(ns_name, "") == 0) {
@@ -365 +372 @@
         }
 
-        int rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
+        *unit_name_ptr = unit_name;
+        return EOK;
+}
+
+static int loc_service_request_start(const char *ns_name, const char *name)
+{
+        char *unit_name;
+        int rc = loc_service_unit_name(ns_name, name, NAME_TO_START, &unit_name);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
         free(unit_name);
-        free(service_name);
         return rc;
 }
@@ -555 +573 @@
                 return;
         }
+
+        /* Notify sysman about new exposee */
+        char *unit_name = NULL;
+        rc = loc_service_unit_name(namespace->name, service->name,
+            NAME_TO_EXPOSE, &unit_name);
+        if (rc != EOK) {
+                loc_namespace_destroy(namespace);
+                fibril_mutex_unlock(&services_list_mutex);
+                free(service->name);
+                free(service);
+                free(unit_name);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        if (str_cmp(namespace->name, LOC_DEVICE_NAMESPACE) == 0) {
+                sysman_exposee_added(unit_name);
+        } else {
+                sysman_main_exposee_added(unit_name, icall->in_task_id);
+        }
+        free(unit_name);
 
         /* Get unique service ID */
@@ -837 +876 @@
                 }
 
-                if (flags & IPC_FLAG_BLOCKING) {
+                if ((flags & IPC_FLAG_BLOCKING) || flags & IPC_FLAG_AUTOSTART) {
                         fibril_condvar_wait(&services_list_cv,
                             &services_list_mutex);