Changes in uspace/srv/devman/devman.c [c7bbf029:8b1e15ac] in mainline

File:

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

uspace/srv/devman/devman.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <io/log.h>
 #include <ipc/driver.h>
 #include <ipc/devman.h>
 #include <devmap.h>
 #include <str_error.h>
-#include <stdio.h>
 
 #include "devman.h"
@@ -148 +146 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
-            "drivers.", drv->name);
+        printf(NAME": the '%s' driver was added to the list of available "
+            "drivers.\n", drv->name);
 }
 
@@ -239 +237 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
+        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
         
         bool suc = false;
@@ -249 +247 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
-                    conf_path, str_error(fd));
+                printf(NAME ": unable to open %s\n", conf_path);
                 goto cleanup;
         }
@@ -258 +255 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
-                    conf_path);
+                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
                 goto cleanup;
         }
@@ -265 +261 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
-                    "'%s'.", conf_path);
+                printf(NAME ": memory allocation failed when parsing file "
+                    "'%s'.\n", conf_path);
                 goto cleanup;
         }
         
-        ssize_t read_bytes = safe_read(fd, buf, len);
-        if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
+        if (read(fd, buf, len) <= 0) {
+                printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
-        buf[read_bytes] = 0;
+        buf[len] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -310 +305 @@
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
 {
-        log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
+        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
             base_path, name);
         
@@ -342 +337 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
-                    drv->binary_path);
+                printf(NAME ": driver not found at path %s.", drv->binary_path);
                 goto cleanup;
         }
@@ -370 +364 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
+        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
         
         int drv_cnt = 0;
@@ -404 +398 @@
         dev_node_t *dev;
         
-        log_msg(LVL_DEBUG, "create_root_nodes()");
+        printf(NAME ": create_root_nodes\n");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -489 +483 @@
 void attach_driver(dev_node_t *dev, driver_t *drv)
 {
-        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
-            dev->pfun->pathname, drv->name);
+        printf(NAME ": attach_driver %s to device %s\n",
+            drv->name, dev->pfun->pathname);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -512 +506 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
+        printf(NAME ": start_driver '%s'\n", drv->name);
         
         rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
-                    drv->name, drv->binary_path, str_error(rc));
+                printf(NAME ": error spawning %s (%s)\n",
+                    drv->name, str_error(rc));
                 return false;
         }
@@ -556 +550 @@
 }
 
+/** Remember the driver's phone.
+ *
+ * @param driver        The driver.
+ * @param phone         The phone to the driver.
+ */
+void set_driver_phone(driver_t *driver, sysarg_t phone)
+{
+        fibril_mutex_lock(&driver->driver_mutex);
+        assert(driver->state == DRIVER_STARTING);
+        driver->phone = phone;
+        fibril_mutex_unlock(&driver->driver_mutex);
+}
+
 /** Notify driver about the devices to which it was assigned.
  *
@@ -566 +573 @@
         int phone;
 
-        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
-            driver->name);
+        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
 
         fibril_mutex_lock(&driver->driver_mutex);
@@ -634 +640 @@
          * immediately and possibly started here as well.
          */
-        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -651 +657 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
-            driver->name);
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*
@@ -673 +678 @@
         list_initialize(&drv->devices);
         fibril_mutex_initialize(&drv->driver_mutex);
-        drv->phone = -1;
 }
 
@@ -743 +747 @@
          * access any structures that would affect driver_t.
          */
-        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
-            drv->name, dev->pfun->name);
+        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
+            dev->pfun->name);
         
         sysarg_t rc;
@@ -805 +809 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                log_msg(LVL_ERROR, "No driver found for device `%s'.",
+                printf(NAME ": no driver found for device '%s'.\n",
                     dev->pfun->pathname);
                 return false;
@@ -843 +847 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        log_msg(LVL_DEBUG, "init_device_tree()");
+        printf(NAME ": init_device_tree.\n");
         
         tree->current_handle = 0;
@@ -1022 +1026 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate device path.");
+                printf(NAME ": failed to allocate device path.\n");
                 return false;
         }
@@ -1053 +1057 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
-        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
-            dev, pfun, pfun->pathname);
-
         /* Add the node to the handle-to-node map. */
         dev->handle = ++tree->current_handle;
@@ -1062 +1063 @@
 
         /* Add the node to the list of its parent's children. */
+        printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun);
         dev->pfun = pfun;
         pfun->child = dev;
@@ -1121 +1123 @@
 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
-        assert(path != NULL);
-
-        bool is_absolute = path[0] == '/';
-        if (!is_absolute) {
-                return NULL;
-        }
-
         fibril_rwlock_read_lock(&tree->rwlock);
         
@@ -1137 +1132 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = true;
+        bool cont = (rel_path[0] == '/');
         
         while (cont && fun != NULL) {
@@ -1162 +1157 @@
 }
 
-/** Find function with a specified name belonging to given device.
- *
- * Device tree rwlock should be held at least for reading.
- *
- * @param dev Device the function belongs to.
- * @param name Function name (not path).
- * @return Function node.
- * @retval NULL No function with given name.
- */
-fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name)
-{
-        assert(dev != NULL);
-        assert(name != NULL);
-
-        fun_node_t *fun;
-        link_t *link;
-
-        for (link = dev->functions.next;
-            link != &dev->functions;
-            link = link->next) {
-                fun = list_get_instance(link, fun_node_t, dev_functions);
-
-                if (str_cmp(name, fun->name) == 0)
-                        return fun;
-        }
-
-        return NULL;
-}
-
-/** 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.
  *
@@ -1231 +1167 @@
 fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
 {
-        return find_fun_node_in_device(pfun->child, name);
+        fun_node_t *fun;
+        link_t *link;
+        
+        link = pfun->child->functions.next;
+        
+        while (link != &pfun->child->functions) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+                
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+                
+                link = link->next;
+        }
+        
+        return NULL;
 }
 
@@ -1265 +1215 @@
         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);
+                list_initialize(&info->dev_classes);
+                list_initialize(&info->devmap_link);
+                list_initialize(&info->link);
         }
         
@@ -1393 +1343 @@
 }
 
-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);
-
-        link_t *link;
-        for (link = dev_class->devices.next;
-            link != &dev_class->devices;
-            link = link->next) {
-                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)
 {