Changeset 63a3276 in mainline for uspace/srv/devman/driver.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/devman/driver.c (modified) (4 diffs)

uspace/srv/devman/driver.c

@@ -186 +186 @@
 
         return drv_cnt;
+}
+
+/** Get name of unit that represents the driver
+ *
+ * @param[in]  drv
+ * @param[out] unit_name_ptr  should be free'd after use, not touched on fail
+ *
+ * @return     EOK on success
+ * @return     ENOMEM
+ */
+errno_t driver_unit_name(driver_t *drv, char **unit_name_ptr)
+{
+        char *unit_name = NULL;
+        asprintf(&unit_name, "%s%c%s", drv->name, UNIT_NAME_SEPARATOR,
+            UNIT_SVC_TYPE_NAME);
+
+        if (unit_name == NULL) {
+                return ENOMEM;
+        } else {
+                *unit_name_ptr = unit_name;
+                return EOK;
+        }
 }
 
@@ -320 +342 @@
 
         char *unit_name = NULL;
-        asprintf(&unit_name, "%s%c%s", drv->name, UNIT_NAME_SEPARATOR,
-            UNIT_SVC_TYPE_NAME);
-        if (unit_name == NULL) {
+        if (driver_unit_name(drv, &unit_name) != EOK) {
                 return false;
         }
@@ -333 +353 @@
         int flags = 0;
         rc = sysman_unit_start(unit_name, flags);
+        free(unit_name);
 
         if (rc != EOK) {
@@ -338 +359 @@
                     "Request to start driver `%s' failed: %s.",
                     drv->name, str_error(rc));
-                free(unit_name);
                 return false;
         }
 
         drv->state = DRIVER_STARTING;
-        free(unit_name);
         return true;
 }