Changeset 957cfa58 in mainline for uspace/srv/devman/main.c

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/main.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -246 +246 @@
 static void devman_add_child(ipc_callid_t callid, ipc_call_t *call)
 {
-        // printf(NAME ": devman_add_child\n");
+        //printf(NAME ": devman_add_child\n");
         
         device_handle_t parent_handle = IPC_GET_ARG1(*call);
         ipcarg_t match_count = IPC_GET_ARG2(*call);
-        
-        node_t *parent =  find_dev_node(&device_tree, parent_handle);
+        dev_tree_t *tree = &device_tree;
+        
+        fibril_rwlock_write_lock(&tree->rwlock);
+        node_t *parent =  find_dev_node_no_lock(&device_tree, parent_handle);
         
         if (NULL == parent) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
                 ipc_answer_0(callid, ENOENT);
                 return;
@@ -261 +264 @@
         int rc = async_string_receive(&dev_name, DEVMAN_NAME_MAXLEN, NULL);     
         if (EOK != rc) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
                 ipc_answer_0(callid, rc);
                 return;
         }
-        // printf(NAME ": newly added child device's name is '%s'.\n", dev_name);
+        //printf(NAME ": newly added child device's name is '%s'.\n", dev_name);
         
         node_t *node = create_dev_node();
         if (!insert_dev_node(&device_tree, node, dev_name, parent)) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
                 delete_dev_node(node);
                 ipc_answer_0(callid, ENOMEM);
                 return;
         }       
+        fibril_rwlock_write_unlock(&tree->rwlock);
         
         printf(NAME ": devman_add_child %s\n", node->pathname);
@@ -281 +287 @@
         
         // try to find suitable driver and assign it to the device      
-        assign_driver(node, &drivers_list);
+        assign_driver(node, &drivers_list);     
 }