Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/devman/main.c

    rfc8c2b6 r9b415c9  
    4343#include <stdio.h>
    4444#include <errno.h>
     45#include <str_error.h>
    4546#include <bool.h>
    4647#include <fibril_synch.h>
    … …  
    5152#include <sys/stat.h>
    5253#include <ctype.h>
     54#include <io/log.h>
    5355#include <ipc/devman.h>
    5456#include <ipc/driver.h>
    … …  
    7173        driver_t *driver = NULL;
    7274
    73         printf(NAME ": devman_driver_register \n");
     75        log_msg(LVL_DEBUG, "devman_driver_register\n");
    7476       
    7577        iid = async_get_call(&icall);
    … …  
    8890        }
    8991
    90         printf(NAME ": the %s driver is trying to register by the service.\n",
     92        log_msg(LVL_DEBUG, "The `%s' driver is trying to register.\n",
    9193            drv_name);
    9294       
    … …  
    9597       
    9698        if (driver == NULL) {
    97                 printf(NAME ": no driver named %s was found.\n", drv_name);
     99                log_msg(LVL_ERROR, "No driver named `%s' was found.\n", drv_name);
    98100                free(drv_name);
    99101                drv_name = NULL;
    … …  
    106108       
    107109        /* Create connection to the driver. */
    108         printf(NAME ":  creating connection to the %s driver.\n", driver->name);
     110        log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.\n",
     111            driver->name);
    109112        ipc_call_t call;
    110113        ipc_callid_t callid = async_get_call(&call);
    … …  
    118121        set_driver_phone(driver, IPC_GET_ARG5(call));
    119122       
    120         printf(NAME ": the %s driver was successfully registered as running.\n",
     123        log_msg(LVL_NOTE,
     124            "The `%s' driver was successfully registered as running.\n",
    121125            driver->name);
    122126       
    … …  
    142146        callid = async_get_call(&call);
    143147        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
    144                 printf(NAME ": ERROR: devman_receive_match_id - invalid "
    145                     "protocol.\n");
     148                log_msg(LVL_ERROR,
     149                    "Invalid protocol when trying to receive match id.\n");
    146150                async_answer_0(callid, EINVAL);
    147151                delete_match_id(match_id);
    … …  
    150154       
    151155        if (match_id == NULL) {
    152                 printf(NAME ": ERROR: devman_receive_match_id - failed to "
    153                     "allocate match id.\n");
     156                log_msg(LVL_ERROR, "Failed to allocate match id.\n");
    154157                async_answer_0(callid, ENOMEM);
    155158                return ENOMEM;
    … …  
    165168        if (rc != EOK) {
    166169                delete_match_id(match_id);
    167                 printf(NAME ": devman_receive_match_id - failed to receive "
    168                     "match id string.\n");
     170                log_msg(LVL_ERROR, "Failed to receive match id string: %s.\n",
     171                    str_error(rc));
    169172                return rc;
    170173        }
    … …  
    172175        list_append(&match_id->link, &match_ids->ids);
    173176       
    174         printf(NAME ": received match id '%s', score = %d \n",
     177        log_msg(LVL_DEBUG, "Received match id `%s', score %d.\n",
    175178            match_id->id, match_id->score);
    176179        return rc;
    … …  
    228231        if (ftype != fun_inner && ftype != fun_exposed) {
    229232                /* Unknown function type */
    230                 printf(NAME ": Error, unknown function type provided by driver!\n");
     233                log_msg(LVL_ERROR,
     234                    "Unknown function type %d provided by driver.\n",
     235                    (int) ftype);
    231236
    232237                fibril_rwlock_write_unlock(&tree->rwlock);
    … …  
    243248        }
    244249       
    245         /* Check that function with same name is not there already. */
    246         if (find_fun_node_in_device(pdev, fun_name) != NULL) {
    247                 fibril_rwlock_write_unlock(&tree->rwlock);
    248                 async_answer_0(callid, EEXISTS);
    249                 printf(NAME ": Warning, driver tried to register `%s' twice.\n",
    250                     fun_name);
    251                 free(fun_name);
    252                 return;
    253         }
    254 
    255250        fun_node_t *fun = create_fun_node();
    256251        if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
    … …  
    275270        fibril_rwlock_write_unlock(&tree->rwlock);
    276271       
    277         printf(NAME ": devman_add_function %s\n", fun->pathname);
     272        log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")\n", fun->pathname);
    278273       
    279274        devman_receive_match_ids(match_count, &fun->match_ids);
    … …  
    357352        devmap_register_class_dev(class_info);
    358353       
    359         printf(NAME ": function'%s' added to class '%s', class name '%s' was "
    360             "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
     354        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.\n",
     355            fun->pathname, class_name, class_info->dev_name);
    361356
    362357        async_answer_0(callid, EOK);
    … …  
    373368       
    374369        initialize_running_driver(driver, &device_tree);
    375         printf(NAME ": the %s driver was successfully initialized. \n",
     370        log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.\n",
    376371            driver->name);
    377372        return 0;
    … …  
    395390        fid_t fid = fibril_create(init_running_drv, driver);
    396391        if (fid == 0) {
    397                 printf(NAME ": Error creating fibril for the initialization of "
    398                     "the newly registered running driver.\n");
     392                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
     393                    "for driver `%s' .\n", driver->name);
    399394                return;
    400395        }
    … …  
    448443}
    449444
    450 /** Find handle for the device instance identified by device class name. */
    451 static void devman_function_get_handle_by_class(ipc_callid_t iid,
    452     ipc_call_t *icall)
    453 {
    454         char *classname;
    455         char *devname;
    456 
    457         int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0);
    458         if (rc != EOK) {
    459                 async_answer_0(iid, rc);
    460                 return;
    461         }
    462         rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0);
    463         if (rc != EOK) {
    464                 free(classname);
    465                 async_answer_0(iid, rc);
    466                 return;
    467         }
    468 
    469 
    470         fun_node_t *fun = find_fun_node_by_class(&class_list,
    471             classname, devname);
    472 
    473         free(classname);
    474         free(devname);
    475 
    476         if (fun == NULL) {
    477                 async_answer_0(iid, ENOENT);
    478                 return;
    479         }
    480 
    481         async_answer_1(iid, EOK, fun->handle);
    482 }
    483 
    484445
    485446/** Function for handling connections from a client to the device manager. */
    … …  
    501462                        devman_function_get_handle(callid, &call);
    502463                        break;
    503                 case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
    504                         devman_function_get_handle_by_class(callid, &call);
    505                         break;
    506464                default:
    507465                        async_answer_0(callid, ENOENT);
    … …  
    531489         */
    532490        if (dev == NULL) {
    533                 printf(NAME ": devman_forward error - no device or function with "
    534                     "handle %" PRIun " was found.\n", handle);
     491                log_msg(LVL_ERROR, "IPC forwarding failed - no device or "
     492                    "function with handle %" PRIun " was found.\n", handle);
    535493                async_answer_0(iid, ENOENT);
    536494                return;
    … …  
    538496
    539497        if (fun == NULL && !drv_to_parent) {
    540                 printf(NAME ": devman_forward error - cannot connect to "
    541                     "handle %" PRIun ", refers to a device.\n", handle);
     498                log_msg(LVL_ERROR, NAME ": devman_forward error - cannot "
     499                    "connect to handle %" PRIun ", refers to a device.\n",
     500                    handle);
    542501                async_answer_0(iid, ENOENT);
    543502                return;
    … …  
    560519       
    561520        if (driver == NULL) {
    562                 printf(NAME ": devman_forward error - the device is not in %" PRIun
    563                     " usable state.\n", handle);
     521                log_msg(LVL_ERROR, "IPC forwarding refused - " \
     522                    "the device %" PRIun " is not in usable state.\n", handle);
    564523                async_answer_0(iid, ENOENT);
    565524                return;
    … …  
    573532       
    574533        if (driver->phone <= 0) {
    575                 printf(NAME ": devman_forward: cound not forward to driver %s ",
    576                     driver->name);
    577                 printf("the driver's phone is %" PRIun ").\n", driver->phone);
     534                log_msg(LVL_ERROR,
     535                    "Could not forward to driver `%s' (phone is %d).\n",
     536                    driver->name, (int) driver->phone);
    578537                async_answer_0(iid, EINVAL);
    579538                return;
    … …  
    581540
    582541        if (fun != NULL) {
    583                 printf(NAME ": devman_forward: forward connection to function %s to "
    584                     "driver %s.\n", fun->pathname, driver->name);
     542                log_msg(LVL_DEBUG,
     543                    "Forwarding request for `%s' function to driver `%s'.\n",
     544                    fun->pathname, driver->name);
    585545        } else {
    586                 printf(NAME ": devman_forward: forward connection to device %s to "
    587                     "driver %s.\n", dev->pfun->pathname, driver->name);
     546                log_msg(LVL_DEBUG,
     547                    "Forwarding request for `%s' device to driver `%s'.\n",
     548                    dev->pfun->pathname, driver->name);
    588549        }
    589550
    … …  
    617578        async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
    618579            IPC_FF_NONE);
    619         printf(NAME ": devman_connection_devmapper: forwarded connection to "
    620             "device %s to driver %s.\n", fun->pathname, dev->drv->name);
     580        log_msg(LVL_DEBUG,
     581            "Forwarding devmapper request for `%s' function to driver `%s'.\n",
     582            fun->pathname, dev->drv->name);
    621583}
    622584
    … …  
    653615static bool devman_init(void)
    654616{
    655         printf(NAME ": devman_init - looking for available drivers.\n");
     617        log_msg(LVL_DEBUG, "devman_init - looking for available drivers.\n");
    656618       
    657619        /* Initialize list of available drivers. */
    … …  
    659621        if (lookup_available_drivers(&drivers_list,
    660622            DRIVER_DEFAULT_STORE) == 0) {
    661                 printf(NAME " no drivers found.");
     623                log_msg(LVL_FATAL, "no drivers found.");
    662624                return false;
    663625        }
    664626
    665         printf(NAME ": devman_init - list of drivers has been initialized.\n");
     627        log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.\n");
    666628
    667629        /* Create root device node. */
    668630        if (!init_device_tree(&device_tree, &drivers_list)) {
    669                 printf(NAME " failed to initialize device tree.");
     631                log_msg(LVL_FATAL, "Failed to initialize device tree.");
    670632                return false;
    671633        }
    … …  
    688650        printf(NAME ": HelenOS Device Manager\n");
    689651
     652        if (log_init(NAME, LVL_ERROR) != EOK) {
     653                printf(NAME ": Error initializing logging subsystem.\n");
     654                return -1;
     655        }
     656
    690657        if (!devman_init()) {
    691                 printf(NAME ": Error while initializing service\n");
     658                log_msg(LVL_ERROR, "Error while initializing service.\n");
    692659                return -1;
    693660        }
    … …  
    697664
    698665        /* Register device manager at naming service. */
    699         if (service_register(SERVICE_DEVMAN) != EOK)
     666        if (service_register(SERVICE_DEVMAN) != EOK) {
     667                log_msg(LVL_ERROR, "Failed registering as a service.\n");
    700668                return -1;
    701 
    702         printf(NAME ": Accepting connections\n");
     669        }
     670
     671        printf(NAME ": Accepting connections.\n");
    703672        async_manager();
    704673
Note: See TracChangeset for help on using the changeset viewer.