Changes in uspace/srv/devman/devman.c [9b415c9:df147c7] in mainline

File:

• uspace/srv/devman/devman.c (modified) (22 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>
@@ -147 +146 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
+        printf(NAME": the '%s' driver was added to the list of available "
             "drivers.\n", drv->name);
 }
@@ -238 +237 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")\n", conf_path);
+        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
         
         bool suc = false;
@@ -248 +247 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.\n",
-                    conf_path, str_error(fd));
+                printf(NAME ": unable to open %s\n", conf_path);
                 goto cleanup;
         }
@@ -257 +255 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                log_msg(LVL_ERROR, "Configuration file '%s' is empty.\n",
-                    conf_path);
+                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
                 goto cleanup;
         }
@@ -264 +261 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
+                printf(NAME ": memory allocation failed when parsing file "
                     "'%s'.\n", conf_path);
                 goto cleanup;
@@ -271 +268 @@
         ssize_t read_bytes = safe_read(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s'.\n", conf_path);
+                printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
@@ -309 +306 @@
 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\")\n",
+        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
             base_path, name);
         
@@ -341 +338 @@
         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;
         }
@@ -369 +365 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")\n", dir_path);
+        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
         
         int drv_cnt = 0;
@@ -403 +399 @@
         dev_node_t *dev;
         
-        log_msg(LVL_DEBUG, "create_root_nodes()\n");
+        printf(NAME ": create_root_nodes\n");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -488 +484 @@
 void attach_driver(dev_node_t *dev, driver_t *drv)
 {
-        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")\n",
-            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);
@@ -511 +507 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")\n", 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.\n",
-                    drv->name, drv->binary_path, str_error(rc));
+                printf(NAME ": error spawning %s (%s)\n",
+                    drv->name, str_error(rc));
                 return false;
         }
@@ -578 +574 @@
         int phone;
 
-        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")\n",
-            driver->name);
+        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
 
         fibril_mutex_lock(&driver->driver_mutex);
@@ -646 +641 @@
          * immediately and possibly started here as well.
          */
-        log_msg(LVL_DEBUG, "Driver `%s' enters running state.\n", driver->name);
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -663 +658 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")\n",
-            driver->name);
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*
@@ -754 +748 @@
          * access any structures that would affect driver_t.
          */
-        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")\n",
-            drv->name, dev->pfun->name);
+        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
+            dev->pfun->name);
         
         sysarg_t rc;
@@ -816 +810 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                log_msg(LVL_ERROR, "No driver found for device `%s'.\n",
+                printf(NAME ": no driver found for device '%s'.\n",
                     dev->pfun->pathname);
                 return false;
@@ -854 +848 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        log_msg(LVL_DEBUG, "init_device_tree()\n");
+        printf(NAME ": init_device_tree.\n");
         
         tree->current_handle = 0;
@@ -1033 +1027 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate device path.\n");
+                printf(NAME ": failed to allocate device path.\n");
                 return false;
         }
@@ -1064 +1058 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
-        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])\n",
-            dev, pfun, pfun->pathname);
-
         /* Add the node to the handle-to-node map. */
         dev->handle = ++tree->current_handle;
@@ -1073 +1064 @@
 
         /* 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;