Changeset a676574 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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/devman.c (modified) (9 diffs)

uspace/srv/devman/devman.c

@@ -384 +384 @@
         printf(NAME ": create_root_node\n");
 
+        fibril_rwlock_write_lock(&tree->rwlock);
         node = create_dev_node();
         if (node != NULL) {
@@ -393 +394 @@
                 tree->root_node = node;
         }
+        fibril_rwlock_write_unlock(&tree->rwlock);
 
         return node != NULL;
@@ -455 +457 @@
 /** Start a driver
  *
- * The driver's mutex is assumed to be locked.
- *
  * @param drv           The driver's structure.
  * @return              True if the driver's task is successfully spawned, false
@@ -465 +465 @@
         int rc;
 
+        assert(fibril_mutex_is_locked(&drv->driver_mutex));
+        
         printf(NAME ": start_driver '%s'\n", drv->name);
         
@@ -783 +785 @@
                 /* Notify the driver about the new device. */
                 int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
-                if (phone > 0) {
+                if (phone >= 0) {
                         add_device(phone, drv, node, tree);
                         ipc_hangup(phone);
@@ -859 +861 @@
 /** Find the device node structure of the device witch has the specified handle.
  *
- * Device tree's rwlock should be held at least for reading.
- *
  * @param tree          The device tree where we look for the device node.
  * @param handle        The handle of the device.
@@ -868 +868 @@
 {
         unsigned long key = handle;
-        link_t *link = hash_table_find(&tree->devman_devices, &key);
+        link_t *link;
+        
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
+        
+        link = hash_table_find(&tree->devman_devices, &key);
         return hash_table_get_instance(link, node_t, devman_link);
 }
@@ -924 +928 @@
 /** Insert new device into device tree.
  *
- * The device tree's rwlock should be already held exclusively when calling this
- * function.
- *
  * @param tree          The device tree.
  * @param node          The newly added device node. 
@@ -941 +942 @@
         assert(tree != NULL);
         assert(dev_name != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
         node->name = dev_name;