Changeset 4224ef7 in mainline for uspace/srv/locsrv

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

File:

• uspace/srv/locsrv/locsrv.c (modified) (5 diffs)

uspace/srv/locsrv/locsrv.c

@@ -339 +339 @@
         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) {
                 asprintf(&service_name, "%s", SERVICE_NAME_DEVMAN);
@@ -359 +365 @@
         }
 
-        //printf("%s(%s) before\n", __func__, unit_name);//DEBUG
         int rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
-        //printf("%s(%s) after %i\n", __func__, unit_name, rc);//DEBUG
         free(unit_name);
         free(service_name);
@@ -811 +815 @@
          */
         if (svc == NULL) {
-                //printf("%s: service '%s/%s' not found\n", NAME, ns_name, name);//DEBUG
-                if (flags & (IPC_FLAG_AUTOSTART | IPC_FLAG_BLOCKING)) {
-                        /* TODO:
-                         * consider non-blocking service start, return
-                         * some dummy id and block only after connection
-                         * request (actually makes more sense as those who asks
-                         * for ID might be someone else than those connecting)
-                         */
-                        if (!start_requested && (flags & IPC_FLAG_AUTOSTART)) {
-                                rc = loc_service_request_start(ns_name, name);
-                                if (rc != EOK) {
-                                        goto finish;
-                                }
-                                start_requested = true;
+                /* TODO:
+                 * consider non-blocking service start, return
+                 * some dummy id and block only after connection
+                 * request (actually makes more sense as those who asks
+                 * for ID might be someone else than those connecting)
+                 * Note:
+                 * service_list_mutex is released as we don't need to keep it
+                 * while waiting for start request to finish.
+                 */
+                if ((flags & IPC_FLAG_AUTOSTART) && !start_requested) {
+                        fibril_mutex_unlock(&services_list_mutex);
+                        rc = loc_service_request_start(ns_name, name);
+                        fibril_mutex_lock(&services_list_mutex);
+                        start_requested = true;
+
+                        if (rc != EOK) {
+                                goto finish;
+                        } else {
+                                goto recheck;
                         }
-
+                }
+
+                if (flags & IPC_FLAG_BLOCKING) {
                         fibril_condvar_wait(&services_list_cv,
                             &services_list_mutex);
@@ -833 +844 @@
                 rc = ENOENT;
         } else {
-                //printf("%s: service '%s/%s' FOUND\n", NAME, ns_name, name);//DEBUG
                 rc = EOK;
         }
@@ -1621 +1631 @@
 
         /* Let sysman know we are broker */
-        printf("%s: sysman_broker_register : pre\n", NAME);
         rc = sysman_broker_register();
-        printf("%s: sysman_broker_register : post\n", NAME);
         if (rc != EOK) {
                 printf("%s: Error registering at sysman (%i)\n", NAME, rc);