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

File:

• uspace/srv/devman/main.c (modified) (26 diffs)

uspace/srv/devman/main.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <errno.h>
-#include <str_error.h>
 #include <bool.h>
 #include <fibril_synch.h>
@@ -52 +51 @@
 #include <sys/stat.h>
 #include <ctype.h>
-#include <io/log.h>
 #include <ipc/devman.h>
 #include <ipc/driver.h>
@@ -73 +71 @@
         driver_t *driver = NULL;
 
-        log_msg(LVL_DEBUG, "devman_driver_register\n");
+        printf(NAME ": devman_driver_register \n");
         
         iid = async_get_call(&icall);
@@ -90 +88 @@
         }
 
-        log_msg(LVL_DEBUG, "The `%s' driver is trying to register.\n",
+        printf(NAME ": the %s driver is trying to register by the service.\n",
             drv_name);
         
@@ -97 +95 @@
         
         if (driver == NULL) {
-                log_msg(LVL_ERROR, "No driver named `%s' was found.\n", drv_name);
+                printf(NAME ": no driver named %s was found.\n", drv_name);
                 free(drv_name);
                 drv_name = NULL;
@@ -108 +106 @@
         
         /* Create connection to the driver. */
-        log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.\n",
-            driver->name);
+        printf(NAME ":  creating connection to the %s driver.\n", driver->name);
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
@@ -121 +118 @@
         set_driver_phone(driver, IPC_GET_ARG5(call));
         
-        log_msg(LVL_NOTE, 
-            "The `%s' driver was successfully registered as running.\n",
+        printf(NAME ": the %s driver was successfully registered as running.\n",
             driver->name);
         
@@ -146 +142 @@
         callid = async_get_call(&call);
         if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
-                log_msg(LVL_ERROR, 
-                    "Invalid protocol when trying to receive match id.\n");
+                printf(NAME ": ERROR: devman_receive_match_id - invalid "
+                    "protocol.\n");
                 async_answer_0(callid, EINVAL); 
                 delete_match_id(match_id);
@@ -154 +150 @@
         
         if (match_id == NULL) {
-                log_msg(LVL_ERROR, "Failed to allocate match id.\n");
+                printf(NAME ": ERROR: devman_receive_match_id - failed to "
+                    "allocate match id.\n");
                 async_answer_0(callid, ENOMEM);
                 return ENOMEM;
@@ -168 +165 @@
         if (rc != EOK) {
                 delete_match_id(match_id);
-                log_msg(LVL_ERROR, "Failed to receive match id string: %s.\n",
-                    str_error(rc));
+                printf(NAME ": devman_receive_match_id - failed to receive "
+                    "match id string.\n");
                 return rc;
         }
@@ -175 +172 @@
         list_append(&match_id->link, &match_ids->ids);
         
-        log_msg(LVL_DEBUG, "Received match id `%s', score %d.\n",
+        printf(NAME ": received match id '%s', score = %d \n",
             match_id->id, match_id->score);
         return rc;
@@ -231 +228 @@
         if (ftype != fun_inner && ftype != fun_exposed) {
                 /* Unknown function type */
-                log_msg(LVL_ERROR, 
-                    "Unknown function type %d provided by driver.\n",
-                    (int) ftype);
+                printf(NAME ": Error, unknown function type provided by driver!\n");
 
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -270 +265 @@
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")\n", fun->pathname);
+        printf(NAME ": devman_add_function %s\n", fun->pathname);
         
         devman_receive_match_ids(match_count, &fun->match_ids);
@@ -352 +347 @@
         devmap_register_class_dev(class_info);
         
-        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.\n",
-            fun->pathname, class_name, class_info->dev_name);
+        printf(NAME ": function'%s' added to class '%s', class name '%s' was "
+            "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
 
         async_answer_0(callid, EOK);
@@ -368 +363 @@
         
         initialize_running_driver(driver, &device_tree);
-        log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.\n",
+        printf(NAME ": the %s driver was successfully initialized. \n",
             driver->name);
         return 0;
@@ -390 +385 @@
         fid_t fid = fibril_create(init_running_drv, driver);
         if (fid == 0) {
-                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
-                    "for driver `%s' .\n", driver->name);
+                printf(NAME ": Error creating fibril for the initialization of "
+                    "the newly registered running driver.\n");
                 return;
         }
@@ -489 +484 @@
          */
         if (dev == NULL) {
-                log_msg(LVL_ERROR, "IPC forwarding failed - no device or "
-                    "function with handle %" PRIun " was found.\n", handle);
+                printf(NAME ": devman_forward error - no device or function with "
+                    "handle %" PRIun " was found.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -496 +491 @@
 
         if (fun == NULL && !drv_to_parent) {
-                log_msg(LVL_ERROR, NAME ": devman_forward error - cannot "
-                    "connect to handle %" PRIun ", refers to a device.\n",
-                    handle);
+                printf(NAME ": devman_forward error - cannot connect to "
+                    "handle %" PRIun ", refers to a device.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -519 +513 @@
         
         if (driver == NULL) {
-                log_msg(LVL_ERROR, "IPC forwarding refused - " \
-                    "the device %" PRIun " is not in usable state.\n", handle);
+                printf(NAME ": devman_forward error - the device is not in %" PRIun
+                    " usable state.\n", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -532 +526 @@
         
         if (driver->phone <= 0) {
-                log_msg(LVL_ERROR, 
-                    "Could not forward to driver `%s' (phone is %d).\n",
-                    driver->name, (int) driver->phone);
+                printf(NAME ": devman_forward: cound not forward to driver %s ",
+                    driver->name);
+                printf("the driver's phone is %" PRIun ").\n", driver->phone);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -540 +534 @@
 
         if (fun != NULL) {
-                log_msg(LVL_DEBUG, 
-                    "Forwarding request for `%s' function to driver `%s'.\n",
-                    fun->pathname, driver->name);
+                printf(NAME ": devman_forward: forward connection to function %s to "
+                    "driver %s.\n", fun->pathname, driver->name);
         } else {
-                log_msg(LVL_DEBUG, 
-                    "Forwarding request for `%s' device to driver `%s'.\n",
-                    dev->pfun->pathname, driver->name);
+                printf(NAME ": devman_forward: forward connection to device %s to "
+                    "driver %s.\n", dev->pfun->pathname, driver->name);
         }
 
@@ -578 +570 @@
         async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        log_msg(LVL_DEBUG, 
-            "Forwarding devmapper request for `%s' function to driver `%s'.\n",
-            fun->pathname, dev->drv->name);
+        printf(NAME ": devman_connection_devmapper: forwarded connection to "
+            "device %s to driver %s.\n", fun->pathname, dev->drv->name);
 }
 
@@ -615 +606 @@
 static bool devman_init(void)
 {
-        log_msg(LVL_DEBUG, "devman_init - looking for available drivers.\n");
+        printf(NAME ": devman_init - looking for available drivers.\n");
         
         /* Initialize list of available drivers. */
@@ -621 +612 @@
         if (lookup_available_drivers(&drivers_list,
             DRIVER_DEFAULT_STORE) == 0) {
-                log_msg(LVL_FATAL, "no drivers found.");
+                printf(NAME " no drivers found.");
                 return false;
         }
 
-        log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.\n");
+        printf(NAME ": devman_init  - list of drivers has been initialized.\n");
 
         /* Create root device node. */
         if (!init_device_tree(&device_tree, &drivers_list)) {
-                log_msg(LVL_FATAL, "Failed to initialize device tree.");
+                printf(NAME " failed to initialize device tree.");
                 return false;
         }
@@ -650 +641 @@
         printf(NAME ": HelenOS Device Manager\n");
 
-        if (log_init(NAME, LVL_ERROR) != EOK) {
-                printf(NAME ": Error initializing logging subsystem.\n");
-                return -1;
-        }
-
         if (!devman_init()) {
-                log_msg(LVL_ERROR, "Error while initializing service.\n");
+                printf(NAME ": Error while initializing service\n");
                 return -1;
         }
@@ -664 +650 @@
 
         /* Register device manager at naming service. */
-        if (service_register(SERVICE_DEVMAN) != EOK) {
-                log_msg(LVL_ERROR, "Failed registering as a service.\n");
+        if (service_register(SERVICE_DEVMAN) != EOK)
                 return -1;
-        }
-
-        printf(NAME ": Accepting connections.\n");
+
+        printf(NAME ": Accepting connections\n");
         async_manager();