Changeset 957cfa58 in mainline for uspace/srv/devman/devman.h

Timestamp:

2010-05-26T20:25:43Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

c9f3b45c

Parents:

d51ee2b

Message:

devman - use hash table to lookup device according to its handle.

File:

• uspace/srv/devman/devman.h (modified) (7 diffs)

uspace/srv/devman/devman.h

@@ -39 +39 @@
 #include <str.h>
 #include <adt/list.h>
+#include <adt/hash_table.h>
 #include <ipc/ipc.h>
 #include <ipc/devman.h>
@@ -50 +51 @@
 
 #define MATCH_EXT ".ma"
-#define MAX_DEV 256
+#define DEVICE_BUCKETS 256
 
 struct node;
@@ -115 +116 @@
         /** List of child device nodes. */
         link_t children;
-        /** Fibril mutex for the list of child device nodes of this node. */
-        fibril_mutex_t children_mutex;
         /** List of device ids for device-to-driver matching.*/
         match_id_list_t match_ids;
@@ -128 +127 @@
         /** The list of device classes to which this device belongs.*/
         link_t classes;
+        /** Devmap handle if the device is registered by devmapper. */
+        dev_handle_t devmap_handle;
+        /** Used by the hash table of devices indexed by devman device handles.*/
+        link_t devman_link;
+        /** Used by the hash table of devices indexed by devmap device handles.*/
+        link_t devmap_link;
 };
+
 
 /** Represents device tree.
@@ -136 +142 @@
         node_t *root_node;
         /** The next available handle - handles are assigned in a sequential manner.*/
-        atomic_t current_handle;
-        /** Handle-to-node mapping. */
-        node_t * node_map[MAX_DEV];
+        device_handle_t current_handle;
+        /** Synchronize access to the device tree.*/
+        fibril_rwlock_t rwlock;
+        /** Hash table of all devices indexed by devman handles.*/
+        hash_table_t devman_devices;
+        /** Hash table of devices registered by devmapper, indexed by devmap handles.*/
+        hash_table_t devmap_devices;
+        
 } dev_tree_t;
 
@@ -277 +288 @@
         list_initialize(&res->children);
         list_initialize(&res->match_ids.ids);
-        fibril_mutex_initialize(&res->children_mutex);
         
         return res;
@@ -301 +311 @@
  * 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.
  * @return the device node. 
  */
-static inline node_t * find_dev_node(dev_tree_t *tree, long handle)
-{
-        if (handle < MAX_DEV) {
-                return tree->node_map[handle];
-        }
-        return NULL;
+static inline node_t * find_dev_node_no_lock(dev_tree_t *tree, device_handle_t handle)
+{
+        unsigned long key = handle;
+        link_t *link = hash_table_find(&tree->devman_devices, &key);
+        return hash_table_get_instance(link, node_t, devman_link);
+}
+
+/**
+ * Find the device node structure of the device witch has the specified handle.
+ * 
+ * @param tree the device tree where we look for the device node.
+ * @param handle the handle of the device.
+ * @return the device node. 
+ */
+static inline node_t * find_dev_node(dev_tree_t *tree, device_handle_t handle)
+{
+        node_t *node = NULL;
+        
+        fibril_rwlock_read_lock(&tree->rwlock);
+        
+        node = find_dev_node_no_lock(tree, handle);
+        
+        fibril_rwlock_read_unlock(&tree->rwlock);
+        
+        return node;
 }