Changeset fe2333d in mainline for uspace/srv/devman/main.c

Timestamp:

2010-12-09T00:08:57Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a5a950

Parents:

07b9203e (diff), c01f8e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/devman/main.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -197 +197 @@
 }
 
+static int assign_driver_fibril(void *arg)
+{
+        node_t *node = (node_t *) arg;
+        assign_driver(node, &drivers_list, &device_tree);
+        return EOK;
+}
+
 /** Handle child device registration.
  *
@@ -237 +244 @@
         
         devman_receive_match_ids(match_count, &node->match_ids);
-        
+
+        /*
+         * Try to find a suitable driver and assign it to the device.  We do
+         * not want to block the current fibril that is used for processing
+         * incoming calls: we will launch a separate fibril to handle the
+         * driver assigning. That is because assign_driver can actually include
+         * task spawning which could take some time.
+         */
+        fid_t assign_fibril = fibril_create(assign_driver_fibril, node);
+        if (assign_fibril == 0) {
+                /*
+                 * Fallback in case we are out of memory.
+                 * Probably not needed as we will die soon anyway ;-).
+                 */
+                (void) assign_driver_fibril(node);
+        } else {
+                fibril_add_ready(assign_fibril);
+        }
+
         /* Return device handle to parent's driver. */
         ipc_answer_1(callid, EOK, node->handle);
-        
-        /* Try to find suitable driver and assign it to the device. */
-        assign_driver(node, &drivers_list, &device_tree);
 }
 
@@ -297 +319 @@
         printf(NAME ": device '%s' added to class '%s', class name '%s' was "
             "asigned to it\n", dev->pathname, class_name, class_info->dev_name);
-        
+
         ipc_answer_0(callid, EOK);
 }