Changes in uspace/srv/devman/devman.c [45059d6b:b72efe8] in mainline

File:

• uspace/srv/devman/devman.c (modified) (20 diffs)

uspace/srv/devman/devman.c

@@ -37 +37 @@
 #include <ipc/driver.h>
 #include <ipc/devman.h>
-#include <loc.h>
+#include <devmap.h>
 #include <str_error.h>
 #include <stdio.h>
@@ -66 +66 @@
 }
 
-static int loc_functions_compare(unsigned long key[], hash_count_t keys,
+static int devmap_functions_compare(unsigned long key[], hash_count_t keys,
     link_t *item)
 {
-        fun_node_t *fun = hash_table_get_instance(item, fun_node_t, loc_fun);
-        return (fun->service_id == (service_id_t) key[0]);
+        fun_node_t *fun = hash_table_get_instance(item, fun_node_t, devmap_fun);
+        return (fun->devmap_handle == (devmap_handle_t) key[0]);
+}
+
+static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        dev_class_info_t *class_info
+            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
+        assert(class_info != NULL);
+
+        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -89 +99 @@
 };
 
-static hash_table_operations_t loc_devices_ops = {
+static hash_table_operations_t devmap_devices_ops = {
         .hash = devices_hash,
-        .compare = loc_functions_compare,
+        .compare = devmap_functions_compare,
+        .remove_callback = devices_remove_callback
+};
+
+static hash_table_operations_t devmap_devices_class_ops = {
+        .hash = devices_hash,
+        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -254 +270 @@
         }
         
-        ssize_t read_bytes = read_all(fd, buf, len);
+        ssize_t read_bytes = safe_read(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
-                    read_bytes);
+                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
@@ -406 +421 @@
         }
         
-        insert_fun_node(tree, fun, str_dup(""), NULL);
+        insert_fun_node(tree, fun, clone_string(""), NULL);
         match_id_t *id = create_match_id();
-        id->id = str_dup("root");
+        id->id = clone_string("root");
         id->score = 100;
         add_match_id(&fun->match_ids, id);
@@ -548 +563 @@
 
         fibril_mutex_lock(&driver->driver_mutex);
+        
+        async_exch_t *exch = async_exchange_begin(driver->sess);
+        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+            DRIVER_DEVMAN, 0, 0);
+        async_exchange_end(exch);
+
+        if (!sess) {
+                fibril_mutex_unlock(&driver->driver_mutex);
+                return;
+        }
 
         /*
@@ -573 +598 @@
                 fibril_mutex_unlock(&driver->driver_mutex);
 
-                add_device(driver, dev, tree);
+                add_device(sess, driver, dev, tree);
 
                 /*
@@ -593 +618 @@
                 link = driver->devices.head.next;
         }
+
+        async_hangup(sess);
 
         /*
@@ -673 +700 @@
 }
 
-/** Create loc path and name for the function. */
-void loc_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
-{
-        char *loc_pathname = NULL;
-        char *loc_name = NULL;
-        
-        asprintf(&loc_name, "%s", fun->pathname);
-        if (loc_name == NULL)
+/** Create devmap path and name for the function. */
+void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree)
+{
+        char *devmap_pathname = NULL;
+        char *devmap_name = NULL;
+        
+        asprintf(&devmap_name, "%s", fun->pathname);
+        if (devmap_name == NULL)
                 return;
         
-        replace_char(loc_name, '/', LOC_SEPARATOR);
-        
-        asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE,
-            loc_name);
-        if (loc_pathname == NULL) {
-                free(loc_name);
+        replace_char(devmap_name, '/', DEVMAP_SEPARATOR);
+        
+        asprintf(&devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE,
+            devmap_name);
+        if (devmap_pathname == NULL) {
+                free(devmap_name);
                 return;
         }
         
-        loc_service_register_with_iface(loc_pathname,
-            &fun->service_id, DEVMAN_CONNECT_FROM_LOC);
-        
-        tree_add_loc_function(tree, fun);
-        
-        free(loc_name);
-        free(loc_pathname);
+        devmap_device_register_with_iface(devmap_pathname,
+            &fun->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        
+        tree_add_devmap_function(tree, fun);
+        
+        free(devmap_name);
+        free(devmap_pathname);
 }
 
@@ -706 +733 @@
  * @param node          The device's node in the device tree.
  */
-void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree)
+void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev,
+    dev_tree_t *tree)
 {
         /*
@@ -723 +751 @@
         }
         
-        async_exch_t *exch = async_exchange_begin(drv->sess);
+        async_exch_t *exch = async_exchange_begin(sess);
         
         ipc_call_t answer;
@@ -793 +821 @@
         fibril_mutex_unlock(&drv->driver_mutex);
 
-        /* Notify the driver about the new device. */
-        if (is_running)
-                add_device(drv, dev, tree);
+        if (is_running) {
+                /* Notify the driver about the new device. */
+                async_exch_t *exch = async_exchange_begin(drv->sess);
+                async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch,
+                    DRIVER_DEVMAN, 0, 0);
+                async_exchange_end(exch);
+                
+                if (sess) {
+                        add_device(sess, drv, dev, tree);
+                        async_hangup(sess);
+                }
+        }
         
         return true;
@@ -818 +855 @@
         hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1,
             &devman_functions_ops);
-        hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1,
-            &loc_devices_ops);
+        hash_table_create(&tree->devmap_functions, DEVICE_BUCKETS, 1,
+            &devmap_devices_ops);
         
         fibril_rwlock_initialize(&tree->rwlock);
@@ -898 +935 @@
 }
 
-/** Get list of device functions. */
-int dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
-    devman_handle_t *hdl_buf, size_t buf_size, size_t *act_size)
-{
-        size_t act_cnt;
-        size_t buf_cnt;
-
-        assert(fibril_rwlock_is_locked(&tree->rwlock));
-
-        buf_cnt = buf_size / sizeof(devman_handle_t);
-
-        act_cnt = list_count(&dev->functions);
-        *act_size = act_cnt * sizeof(devman_handle_t);
-
-        if (buf_size % sizeof(devman_handle_t) != 0)
-                return EINVAL;
-
-        size_t pos = 0;
-        list_foreach(dev->functions, item) {
-                fun_node_t *fun =
-                    list_get_instance(item, fun_node_t, dev_functions);
-
-                if (pos < buf_cnt)
-                        hdl_buf[pos] = fun->handle;
-                pos++;
-        }
-
-        return EOK;
-}
-
-
 /* Function nodes */
 
@@ -943 +949 @@
                 link_initialize(&res->dev_functions);
                 list_initialize(&res->match_ids.ids);
+                list_initialize(&res->classes);
                 link_initialize(&res->devman_fun);
-                link_initialize(&res->loc_fun);
+                link_initialize(&res->devmap_fun);
         }
         
@@ -1107 +1114 @@
         
         return true;
-}
-
-/** Remove function from device tree.
- *
- * @param tree          Device tree
- * @param node          Function node to remove
- */
-void remove_fun_node(dev_tree_t *tree, fun_node_t *fun)
-{
-        assert(tree != NULL);
-        assert(fun != NULL);
-        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
-        
-        /* Remove the node from the handle-to-node map. */
-        unsigned long key = fun->handle;
-        hash_table_remove(&tree->devman_functions, &key, 1);
-        
-        /* Remove the node from the list of its parent's children. */
-        if (fun->dev != NULL)
-                list_remove(&fun->dev_functions);
 }
 
@@ -1154 +1141 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[1] != '\0');
+        bool cont = true;
         
         while (cont && fun != NULL) {
@@ -1205 +1192 @@
 }
 
+/** Find function node by its class name and index. */
+fun_node_t *find_fun_node_by_class(class_list_t *class_list,
+    const char *class_name, const char *dev_name)
+{
+        assert(class_list != NULL);
+        assert(class_name != NULL);
+        assert(dev_name != NULL);
+
+        fibril_rwlock_read_lock(&class_list->rwlock);
+
+        dev_class_t *cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        dev_class_info_t *dev = find_dev_in_class(cl, dev_name);
+        if (dev == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        fun_node_t *fun = dev->fun;
+
+        fibril_rwlock_read_unlock(&class_list->rwlock);
+
+        return fun;
+}
+
+
 /** Find child function node with a specified name.
  *
@@ -1218 +1235 @@
 }
 
-/* loc devices */
-
-fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id)
+/* Device classes */
+
+/** Create device class.
+ *
+ * @return      Device class.
+ */
+dev_class_t *create_dev_class(void)
+{
+        dev_class_t *cl;
+        
+        cl = (dev_class_t *) malloc(sizeof(dev_class_t));
+        if (cl != NULL) {
+                memset(cl, 0, sizeof(dev_class_t));
+                list_initialize(&cl->devices);
+                fibril_mutex_initialize(&cl->mutex);
+        }
+        
+        return cl;
+}
+
+/** Create device class info.
+ *
+ * @return              Device class info.
+ */
+dev_class_info_t *create_dev_class_info(void)
+{
+        dev_class_info_t *info;
+        
+        info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
+        if (info != NULL) {
+                memset(info, 0, sizeof(dev_class_info_t));
+                link_initialize(&info->dev_classes);
+                link_initialize(&info->devmap_link);
+                link_initialize(&info->link);
+        }
+        
+        return info;
+}
+
+size_t get_new_class_dev_idx(dev_class_t *cl)
+{
+        size_t dev_idx;
+        
+        fibril_mutex_lock(&cl->mutex);
+        dev_idx = ++cl->curr_dev_idx;
+        fibril_mutex_unlock(&cl->mutex);
+        
+        return dev_idx;
+}
+
+
+/** Create unique device name within the class.
+ *
+ * @param cl            The class.
+ * @param base_dev_name Contains the base name for the device if it was
+ *                      specified by the driver when it registered the device by
+ *                      the class; NULL if driver specified no base name.
+ * @return              The unique name for the device within the class.
+ */
+char *create_dev_name_for_class(dev_class_t *cl, const char *base_dev_name)
+{
+        char *dev_name;
+        const char *base_name;
+        
+        if (base_dev_name != NULL)
+                base_name = base_dev_name;
+        else
+                base_name = cl->base_dev_name;
+        
+        size_t idx = get_new_class_dev_idx(cl);
+        asprintf(&dev_name, "%s%zu", base_name, idx);
+        
+        return dev_name;
+}
+
+/** Add the device function to the class.
+ *
+ * The device may be added to multiple classes and a class may contain multiple
+ * devices. The class and the device are associated with each other by the
+ * dev_class_info_t structure.
+ *
+ * @param dev           The device.
+ * @param class         The class.
+ * @param base_dev_name The base name of the device within the class if
+ *                      specified by the driver, NULL otherwise.
+ * @return              dev_class_info_t structure which associates the device
+ *                      with the class.
+ */
+dev_class_info_t *add_function_to_class(fun_node_t *fun, dev_class_t *cl,
+    const char *base_dev_name)
+{
+        dev_class_info_t *info;
+
+        assert(fun != NULL);
+        assert(cl != NULL);
+
+        info = create_dev_class_info();
+
+        
+        if (info != NULL) {
+                info->dev_class = cl;
+                info->fun = fun;
+                
+                /* Add the device to the class. */
+                fibril_mutex_lock(&cl->mutex);
+                list_append(&info->link, &cl->devices);
+                fibril_mutex_unlock(&cl->mutex);
+                
+                /* Add the class to the device. */
+                list_append(&info->dev_classes, &fun->classes);
+                
+                /* Create unique name for the device within the class. */
+                info->dev_name = create_dev_name_for_class(cl, base_dev_name);
+        }
+        
+        return info;
+}
+
+dev_class_t *get_dev_class(class_list_t *class_list, char *class_name)
+{
+        dev_class_t *cl;
+        
+        fibril_rwlock_write_lock(&class_list->rwlock);
+        cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                cl = create_dev_class();
+                if (cl != NULL) {
+                        cl->name = class_name;
+                        cl->base_dev_name = "";
+                        add_dev_class_no_lock(class_list, cl);
+                }
+        }
+
+        fibril_rwlock_write_unlock(&class_list->rwlock);
+        return cl;
+}
+
+dev_class_t *find_dev_class_no_lock(class_list_t *class_list,
+    const char *class_name)
+{
+        dev_class_t *cl;
+        
+        list_foreach(class_list->classes, link) {
+                cl = list_get_instance(link, dev_class_t, link);
+                if (str_cmp(cl->name, class_name) == 0) {
+                        return cl;
+                }
+        }
+        
+        return NULL;
+}
+
+void add_dev_class_no_lock(class_list_t *class_list, dev_class_t *cl)
+{
+        list_append(&cl->link, &class_list->classes);
+}
+
+dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name)
+{
+        assert(dev_class != NULL);
+        assert(dev_name != NULL);
+
+        list_foreach(dev_class->devices, link) {
+                dev_class_info_t *dev = list_get_instance(link,
+                    dev_class_info_t, link);
+
+                if (str_cmp(dev->dev_name, dev_name) == 0) {
+                        return dev;
+                }
+        }
+
+        return NULL;
+}
+
+void init_class_list(class_list_t *class_list)
+{
+        list_initialize(&class_list->classes);
+        fibril_rwlock_initialize(&class_list->rwlock);
+        hash_table_create(&class_list->devmap_functions, DEVICE_BUCKETS, 1,
+            &devmap_devices_class_ops);
+}
+
+
+/* Devmap devices */
+
+fun_node_t *find_devmap_tree_function(dev_tree_t *tree, devmap_handle_t devmap_handle)
 {
         fun_node_t *fun = NULL;
         link_t *link;
-        unsigned long key = (unsigned long) service_id;
+        unsigned long key = (unsigned long) devmap_handle;
         
         fibril_rwlock_read_lock(&tree->rwlock);
-        link = hash_table_find(&tree->loc_functions, &key);
+        link = hash_table_find(&tree->devmap_functions, &key);
         if (link != NULL)
-                fun = hash_table_get_instance(link, fun_node_t, loc_fun);
+                fun = hash_table_get_instance(link, fun_node_t, devmap_fun);
         fibril_rwlock_read_unlock(&tree->rwlock);
         
@@ -1235 +1435 @@
 }
 
-void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun)
-{
-        unsigned long key = (unsigned long) fun->service_id;
+fun_node_t *find_devmap_class_function(class_list_t *classes,
+    devmap_handle_t devmap_handle)
+{
+        fun_node_t *fun = NULL;
+        dev_class_info_t *cli;
+        link_t *link;
+        unsigned long key = (unsigned long)devmap_handle;
+        
+        fibril_rwlock_read_lock(&classes->rwlock);
+        link = hash_table_find(&classes->devmap_functions, &key);
+        if (link != NULL) {
+                cli = hash_table_get_instance(link, dev_class_info_t,
+                    devmap_link);
+                fun = cli->fun;
+        }
+        fibril_rwlock_read_unlock(&classes->rwlock);
+        
+        return fun;
+}
+
+void class_add_devmap_function(class_list_t *class_list, dev_class_info_t *cli)
+{
+        unsigned long key = (unsigned long) cli->devmap_handle;
+        
+        fibril_rwlock_write_lock(&class_list->rwlock);
+        hash_table_insert(&class_list->devmap_functions, &key, &cli->devmap_link);
+        fibril_rwlock_write_unlock(&class_list->rwlock);
+
+        assert(find_devmap_class_function(class_list, cli->devmap_handle) != NULL);
+}
+
+void tree_add_devmap_function(dev_tree_t *tree, fun_node_t *fun)
+{
+        unsigned long key = (unsigned long) fun->devmap_handle;
         fibril_rwlock_write_lock(&tree->rwlock);
-        hash_table_insert(&tree->loc_functions, &key, &fun->loc_fun);
+        hash_table_insert(&tree->devmap_functions, &key, &fun->devmap_fun);
         fibril_rwlock_write_unlock(&tree->rwlock);
 }