Changeset 54a0070 in mainline for uspace/srv/devman/devman.c


Ignore:
Timestamp:
2012-09-10T09:54:09Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
40b5421
Parents:
1dbd189 (diff), 42bde6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from lp:~vojtech-horky/helenos/logging

All logging is controlled by the logger service.

The API allows to create hierarchical logs and each log_msg()
must specify which log to use.

It is possible to change reported log level at runtime via
logset utility or at boot time through GRUB parameters.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/devman/devman.c

    r1dbd189 r54a0070  
    151151        fibril_mutex_unlock(&drivers_list->drivers_mutex);
    152152
    153         log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
     153        log_msg(LOG_DEFAULT, LVL_NOTE, "Driver `%s' was added to the list of available "
    154154            "drivers.", drv->name);
    155155}
    … …  
    242242bool read_match_ids(const char *conf_path, match_id_list_t *ids)
    243243{
    244         log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
     244        log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
    245245       
    246246        bool suc = false;
    … …  
    252252        fd = open(conf_path, O_RDONLY);
    253253        if (fd < 0) {
    254                 log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
     254                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",
    255255                    conf_path, str_error(fd));
    256256                goto cleanup;
    … …  
    261261        lseek(fd, 0, SEEK_SET);
    262262        if (len == 0) {
    263                 log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
     263                log_msg(LOG_DEFAULT, LVL_ERROR, "Configuration file '%s' is empty.",
    264264                    conf_path);
    265265                goto cleanup;
    … …  
    268268        buf = malloc(len + 1);
    269269        if (buf == NULL) {
    270                 log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
     270                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed when parsing file "
    271271                    "'%s'.", conf_path);
    272272                goto cleanup;
    … …  
    275275        ssize_t read_bytes = read_all(fd, buf, len);
    276276        if (read_bytes <= 0) {
    277                 log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
     277                log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
    278278                    read_bytes);
    279279                goto cleanup;
    … …  
    314314bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
    315315{
    316         log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
     316        log_msg(LOG_DEFAULT, LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
    317317            base_path, name);
    318318       
    … …  
    346346        struct stat s;
    347347        if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
    348                 log_msg(LVL_ERROR, "Driver not found at path `%s'.",
     348                log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.",
    349349                    drv->binary_path);
    350350                goto cleanup;
    … …  
    374374int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
    375375{
    376         log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
     376        log_msg(LOG_DEFAULT, LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
    377377       
    378378        int drv_cnt = 0;
    … …  
    408408        dev_node_t *dev;
    409409       
    410         log_msg(LVL_DEBUG, "create_root_nodes()");
     410        log_msg(LOG_DEFAULT, LVL_DEBUG, "create_root_nodes()");
    411411       
    412412        fibril_rwlock_write_lock(&tree->rwlock);
    … …  
    495495void attach_driver(dev_tree_t *tree, dev_node_t *dev, driver_t *drv)
    496496{
    497         log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
     497        log_msg(LOG_DEFAULT, LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
    498498            dev->pfun->pathname, drv->name);
    499499       
    … …  
    520520        assert(drv != NULL);
    521521       
    522         log_msg(LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
     522        log_msg(LOG_DEFAULT, LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")",
    523523            dev->pfun->pathname, drv->name);
    524524       
    … …  
    545545        assert(fibril_mutex_is_locked(&drv->driver_mutex));
    546546       
    547         log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
     547        log_msg(LOG_DEFAULT, LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
    548548       
    549549        rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
    550550        if (rc != EOK) {
    551                 log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
     551                log_msg(LOG_DEFAULT, LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
    552552                    drv->name, drv->binary_path, str_error(rc));
    553553                return false;
    … …  
    594594        link_t *link;
    595595
    596         log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
     596        log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
    597597            driver->name);
    598598
    … …  
    614614                }
    615615
    616                 log_msg(LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
     616                log_msg(LOG_DEFAULT, LVL_DEBUG, "pass_devices_to_driver: dev->refcnt=%d\n",
    617617                    (int)atomic_get(&dev->refcnt));
    618618                dev_add_ref(dev);
    … …  
    650650         * immediately and possibly started here as well.
    651651         */
    652         log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
     652        log_msg(LOG_DEFAULT, LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
    653653        driver->state = DRIVER_RUNNING;
    654654
    … …  
    667667void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
    668668{
    669         log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
     669        log_msg(LOG_DEFAULT, LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
    670670            driver->name);
    671671       
    … …  
    761761         * access any structures that would affect driver_t.
    762762         */
    763         log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
     763        log_msg(LOG_DEFAULT, LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
    764764            drv->name, dev->pfun->name);
    765765       
    … …  
    827827        driver_t *drv = find_best_match_driver(drivers_list, dev);
    828828        if (drv == NULL) {
    829                 log_msg(LVL_ERROR, "No driver found for device `%s'.",
     829                log_msg(LOG_DEFAULT, LVL_ERROR, "No driver found for device `%s'.",
    830830                    dev->pfun->pathname);
    831831                return false;
    … …  
    867867        assert(dev != NULL);
    868868       
    869         log_msg(LVL_DEBUG, "driver_dev_remove(%p)", dev);
     869        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_remove(%p)", dev);
    870870       
    871871        fibril_rwlock_read_lock(&tree->rwlock);
    … …  
    890890        assert(dev != NULL);
    891891       
    892         log_msg(LVL_DEBUG, "driver_dev_gone(%p)", dev);
     892        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_gone(%p)", dev);
    893893       
    894894        fibril_rwlock_read_lock(&tree->rwlock);
    … …  
    911911        devman_handle_t handle;
    912912       
    913         log_msg(LVL_DEBUG, "driver_fun_online(%p)", fun);
     913        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_online(%p)", fun);
    914914
    915915        fibril_rwlock_read_lock(&tree->rwlock);
    … …  
    939939        devman_handle_t handle;
    940940       
    941         log_msg(LVL_DEBUG, "driver_fun_offline(%p)", fun);
     941        log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_offline(%p)", fun);
    942942
    943943        fibril_rwlock_read_lock(&tree->rwlock);
    … …  
    970970bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
    971971{
    972         log_msg(LVL_DEBUG, "init_device_tree()");
     972        log_msg(LOG_DEFAULT, LVL_DEBUG, "init_device_tree()");
    973973       
    974974        tree->current_handle = 0;
    … …  
    12611261        fun->pathname = (char *) malloc(pathsize);
    12621262        if (fun->pathname == NULL) {
    1263                 log_msg(LVL_ERROR, "Failed to allocate device path.");
     1263                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate device path.");
    12641264                return false;
    12651265        }
    … …  
    12891289        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
    12901290       
    1291         log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
     1291        log_msg(LOG_DEFAULT, LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
    12921292            dev, pfun, pfun->pathname);
    12931293
    … …  
    13131313        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
    13141314       
    1315         log_msg(LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
     1315        log_msg(LOG_DEFAULT, LVL_DEBUG, "remove_dev_node(dev=%p)", dev);
    13161316       
    13171317        /* Remove node from the handle-to-node map. */
Note: See TracChangeset for help on using the changeset viewer.