Changes in uspace/srv/devman/devman.c [4820360:a1a101d] in mainline

File:

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

uspace/srv/devman/devman.c

@@ -151 +151 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Driver `%s' was added to the list of available "
             "drivers.", drv->name);
 }
@@ -242 +242 @@
 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);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
         
         bool suc = false;
@@ -252 +252 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
                     conf_path, str_error(fd));
                 goto cleanup;
@@ -261 +261 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.",
                     conf_path);
                 goto cleanup;
@@ -268 +268 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed when parsing file "
                     "'%s'.", conf_path);
                 goto cleanup;
@@ -275 +275 @@
         ssize_t read_bytes = read_all(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
                     read_bytes);
                 goto cleanup;
@@ -314 +314 @@
 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\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
             base_path, name);
         
@@ -346 +346 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.",
                     drv->binary_path);
                 goto cleanup;
@@ -374 +374 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
         
         int drv_cnt = 0;
@@ -408 +408 @@
         dev_node_t *dev;
         
-        log_msg(LVL_DEBUG, "create_root_nodes()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "create_root_nodes()");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -495 +495 @@
 void attach_driver(dev_tree_t *tree, dev_node_t *dev, driver_t *drv)
 {
-        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
             dev->pfun->pathname, drv->name);
         
@@ -520 +520 @@
         assert(drv != NULL);
         
-        log_msg(LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
             dev->pfun->pathname, drv->name);
         
@@ -545 +545 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "start_driver(drv=\"%s\")", 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.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
                     drv->name, drv->binary_path, str_error(rc));
                 return false;
@@ -594 +594 @@
         link_t *link;
 
-        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
             driver->name);
 
@@ -614 +614 @@
                 }
 
-                log_msg(LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
                     (int)atomic_get(&dev->refcnt));
                 dev_add_ref(dev);
@@ -650 +650 @@
          * immediately and possibly started here as well.
          */
-        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -667 +667 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
             driver->name);
         
@@ -761 +761 @@
          * access any structures that would affect driver_t.
          */
-        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
             drv->name, dev->pfun->name);
         
@@ -827 +827 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                log_msg(LVL_ERROR, "No driver found for device `%s'.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "No driver found for device `%s'.",
                     dev->pfun->pathname);
                 return false;
@@ -867 +867 @@
         assert(dev != NULL);
         
-        log_msg(LVL_DEBUG, "driver_dev_remove(%p)", dev);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_remove(%p)", dev);
         
         fibril_rwlock_read_lock(&tree->rwlock);
@@ -890 +890 @@
         assert(dev != NULL);
         
-        log_msg(LVL_DEBUG, "driver_dev_gone(%p)", dev);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_gone(%p)", dev);
         
         fibril_rwlock_read_lock(&tree->rwlock);
@@ -911 +911 @@
         devman_handle_t handle;
         
-        log_msg(LVL_DEBUG, "driver_fun_online(%p)", fun);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_online(%p)", fun);
 
         fibril_rwlock_read_lock(&tree->rwlock);
@@ -939 +939 @@
         devman_handle_t handle;
         
-        log_msg(LVL_DEBUG, "driver_fun_offline(%p)", fun);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_offline(%p)", fun);
 
         fibril_rwlock_read_lock(&tree->rwlock);
@@ -970 +970 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        log_msg(LVL_DEBUG, "init_device_tree()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "init_device_tree()");
         
         tree->current_handle = 0;
@@ -1261 +1261 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate device path.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate device path.");
                 return false;
         }
@@ -1289 +1289 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
-        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
             dev, pfun, pfun->pathname);
 
@@ -1313 +1313 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
-        log_msg(LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
         
         /* Remove node from the handle-to-node map. */