Changeset 96ef672 in mainline for uspace/srv/devman/loc.c

Timestamp:

2016-08-05T16:13:38Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c7840e9

Parents:

f527f58

Message:

Do not leave behind functions in device_tree.loc_functions hash table

When offlining or removing a function, make sure to unregister that
function from the device tree loc_functions hash table so that the
table does not contain any deallocated links.

File:

• uspace/srv/devman/loc.c (modified) (2 diffs)

uspace/srv/devman/loc.c

@@ -67 +67 @@
 }
 
+int loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
+{
+        int rc = loc_service_unregister(fun->service_id);
+        tree_rem_loc_function(tree, fun);
+        return rc;
+}
+
 fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id)
 {
@@ -89 +96 @@
 }
 
+void tree_rem_loc_function(dev_tree_t *tree, fun_node_t *fun)
+{
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
+        
+        hash_table_remove(&tree->loc_functions, &fun->service_id);
+}
+
 /** @}
  */