Changeset 63a3276 in mainline for uspace/srv/hid/compositor/compositor.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/hid/compositor/compositor.c (modified) (3 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -2267 +2267 @@
         if (!list_empty(&viewport_list))
                 input_activate(input);
-
 ret:
         fibril_mutex_unlock(&discovery_mtx);
@@ -2285 +2284 @@
         bg_color = PIXEL(255, 69, 51, 103);
 
-        /* Register compositor server. */
-        async_set_fallback_port_handler(client_connection, NULL);
-
-        errno_t rc = loc_server_register(NAME);
+        /* Establish input bidirectional connection. */
+        errno_t rc = input_connect(input_svc);
+        if (rc != EOK) {
+                printf("%s: Failed to connect to input service.\n", NAME);
+                return rc;
+        }
+
+        rc = loc_register_cat_change_cb(category_change_cb, NULL);
+        if (rc != EOK) {
+                printf("%s: Failed to register category change callback\n", NAME);
+                input_disconnect();
+                return rc;
+        }
+
+        discover_viewports();
+
+        comp_restrict_pointers();
+        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
+
+        /* Finally, register compositor server. */
+        async_set_fallback_port_handler(client_connection);
+        
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
-                return -1;
-        }
-
+                return rc;
+        }
+        
         server_name = name;
-
-        char svc[LOC_NAME_MAXLEN + 1];
-        snprintf(svc, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, server_name);
-
-        service_id_t service_id;
-        rc = loc_service_register(svc, &service_id);
-        if (rc != EOK) {
-                printf("%s: Unable to register service %s\n", NAME, svc);
-                return rc;
-        }
-
+        
         /* Prepare window registrator (entrypoint for clients). */
         char winreg[LOC_NAME_MAXLEN + 1];
@@ -2311 +2319 @@
         if (loc_service_register(winreg, &winreg_id) != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, winreg);
-                return -1;
-        }
-
-        /* Establish input bidirectional connection. */
-        rc = input_connect(input_svc);
-        if (rc != EOK) {
-                printf("%s: Failed to connect to input service.\n", NAME);
                 return rc;
         }
-
-        rc = loc_register_cat_change_cb(category_change_cb, NULL);
-        if (rc != EOK) {
-                printf("%s: Failed to register category change callback\n", NAME);
-                input_disconnect();
-                return rc;
-        }
-
-        discover_viewports();
-
-        comp_restrict_pointers();
-        comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 
         return EOK;