Changeset 969585f in mainline for uspace/srv

Timestamp:

2011-04-01T20:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0053fa38, 5542b83, c6ba274

Parents:

8e7d724 (diff), ebcb05a (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 mainline changes

Location:

uspace/srv

Files:

• devman/devman.c (modified) (25 diffs)
• devman/devman.h (modified) (2 diffs)
• devman/main.c (modified) (29 diffs)
• devmap/devmap.c (modified) (1 diff)

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>
@@ -146 +147 @@
         fibril_mutex_unlock(&drivers_list->drivers_mutex);
 
-        printf(NAME": the '%s' driver was added to the list of available "
-            "drivers.\n", drv->name);
-
-        printf(NAME ": match ids:");
-        link_t *cur;
-        for (cur = drv->match_ids.ids.next; cur != &drv->match_ids.ids; cur = cur->next) {
-                match_id_t *match_id = list_get_instance(cur, match_id_t, link);
-                printf(" %d:%s", match_id->score, match_id->id);
-        }
-        printf("\n");
+        log_msg(LVL_NOTE, "Driver `%s' was added to the list of available "
+            "drivers.", drv->name);
 }
 
@@ -245 +238 @@
 bool read_match_ids(const char *conf_path, match_id_list_t *ids)
 {
-        printf(NAME ": read_match_ids conf_path = %s.\n", conf_path);
+        log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
         
         bool suc = false;
@@ -255 +248 @@
         fd = open(conf_path, O_RDONLY);
         if (fd < 0) {
-                printf(NAME ": unable to open %s\n", conf_path);
+                log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.",
+                    conf_path, str_error(fd));
                 goto cleanup;
         }
@@ -263 +257 @@
         lseek(fd, 0, SEEK_SET);
         if (len == 0) {
-                printf(NAME ": configuration file '%s' is empty.\n", conf_path);
+                log_msg(LVL_ERROR, "Configuration file '%s' is empty.",
+                    conf_path);
                 goto cleanup;
         }
@@ -269 +264 @@
         buf = malloc(len + 1);
         if (buf == NULL) {
-                printf(NAME ": memory allocation failed when parsing file "
-                    "'%s'.\n", conf_path);
+                log_msg(LVL_ERROR, "Memory allocation failed when parsing file "
+                    "'%s'.", conf_path);
                 goto cleanup;
         }
@@ -276 +271 @@
         ssize_t read_bytes = safe_read(fd, buf, len);
         if (read_bytes <= 0) {
-                printf(NAME ": unable to read file '%s'.\n", conf_path);
+                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;
         }
@@ -314 +309 @@
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv)
 {
-        printf(NAME ": get_driver_info base_path = %s, name = %s.\n",
+        log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")",
             base_path, name);
         
@@ -346 +341 @@
         struct stat s;
         if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
-                printf(NAME ": driver not found at path %s.", drv->binary_path);
+                log_msg(LVL_ERROR, "Driver not found at path `%s'.",
+                    drv->binary_path);
                 goto cleanup;
         }
@@ -373 +369 @@
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path)
 {
-        printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path);
+        log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path);
         
         int drv_cnt = 0;
@@ -407 +403 @@
         dev_node_t *dev;
         
-        printf(NAME ": create_root_nodes\n");
+        log_msg(LVL_DEBUG, "create_root_nodes()");
         
         fibril_rwlock_write_lock(&tree->rwlock);
@@ -492 +488 @@
 void attach_driver(dev_node_t *dev, driver_t *drv)
 {
-        printf(NAME ": attach_driver %s to device %s\n",
-            drv->name, dev->pfun->pathname);
+        log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")",
+            dev->pfun->pathname, drv->name);
         
         fibril_mutex_lock(&drv->driver_mutex);
@@ -515 +511 @@
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
         
-        printf(NAME ": start_driver '%s'\n", drv->name);
+        log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
         
         rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
         if (rc != EOK) {
-                printf(NAME ": error spawning %s (%s)\n",
-                    drv->name, str_error(rc));
+                log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",
+                    drv->name, drv->binary_path, str_error(rc));
                 return false;
         }
@@ -582 +578 @@
         int phone;
 
-        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
+        log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")",
+            driver->name);
 
         fibril_mutex_lock(&driver->driver_mutex);
@@ -649 +646 @@
          * immediately and possibly started here as well.
          */
-        printf(NAME ": driver %s goes into running state.\n", driver->name);
+        log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -666 +663 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
+        log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")",
+            driver->name);
         
         /*
@@ -756 +754 @@
          * access any structures that would affect driver_t.
          */
-        printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name,
-            dev->pfun->name);
+        log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")",
+            drv->name, dev->pfun->name);
         
         sysarg_t rc;
@@ -818 +816 @@
         driver_t *drv = find_best_match_driver(drivers_list, dev);
         if (drv == NULL) {
-                printf(NAME ": no driver found for device '%s'.\n",
+                log_msg(LVL_ERROR, "No driver found for device `%s'.",
                     dev->pfun->pathname);
                 return false;
@@ -856 +854 @@
 bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list)
 {
-        printf(NAME ": init_device_tree.\n");
+        log_msg(LVL_DEBUG, "init_device_tree()");
         
         tree->current_handle = 0;
@@ -1035 +1033 @@
         fun->pathname = (char *) malloc(pathsize);
         if (fun->pathname == NULL) {
-                printf(NAME ": failed to allocate device path.\n");
+                log_msg(LVL_ERROR, "Failed to allocate device path.");
                 return false;
         }
@@ -1066 +1064 @@
         assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
+        log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])",
+            dev, pfun, pfun->pathname);
+
         /* Add the node to the handle-to-node map. */
         dev->handle = ++tree->current_handle;
@@ -1072 +1073 @@
 
         /* 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;
@@ -1173 +1173 @@
 }
 
+/** Find function with a specified name belonging to given device.
+ *
+ * Device tree rwlock should be held at least for reading.
+ *
+ * @param dev Device the function belongs to.
+ * @param name Function name (not path).
+ * @return Function node.
+ * @retval NULL No function with given name.
+ */
+fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name)
+{
+        assert(dev != NULL);
+        assert(name != NULL);
+
+        fun_node_t *fun;
+        link_t *link;
+
+        for (link = dev->functions.next;
+            link != &dev->functions;
+            link = link->next) {
+                fun = list_get_instance(link, fun_node_t, dev_functions);
+
+                if (str_cmp(name, fun->name) == 0)
+                        return fun;
+        }
+
+        return NULL;
+}
+
+/** Find function node by its class name and index. */
+fun_node_t *find_fun_node_by_class(class_list_t *class_list,
+    const char *class_name, const char *dev_name)
+{
+        assert(class_list != NULL);
+        assert(class_name != NULL);
+        assert(dev_name != NULL);
+
+        fibril_rwlock_read_lock(&class_list->rwlock);
+
+        dev_class_t *cl = find_dev_class_no_lock(class_list, class_name);
+        if (cl == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        dev_class_info_t *dev = find_dev_in_class(cl, dev_name);
+        if (dev == NULL) {
+                fibril_rwlock_read_unlock(&class_list->rwlock);
+                return NULL;
+        }
+
+        fun_node_t *fun = dev->fun;
+
+        fibril_rwlock_read_unlock(&class_list->rwlock);
+
+        return fun;
+}
+
+
 /** Find child function node with a specified name.
  *
@@ -1183 +1242 @@
 fun_node_t *find_node_child(fun_node_t *pfun, const char *name)
 {
-        fun_node_t *fun;
-        link_t *link;
-        
-        link = pfun->child->functions.next;
-        
-        while (link != &pfun->child->functions) {
-                fun = list_get_instance(link, fun_node_t, dev_functions);
-                
-                if (str_cmp(name, fun->name) == 0)
-                        return fun;
-                
-                link = link->next;
-        }
-        
-        return NULL;
+        return find_fun_node_in_device(pfun->child, name);
 }
 
@@ -1359 +1404 @@
 }
 
+dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name)
+{
+        assert(dev_class != NULL);
+        assert(dev_name != NULL);
+
+        link_t *link;
+        for (link = dev_class->devices.next;
+            link != &dev_class->devices;
+            link = link->next) {
+                dev_class_info_t *dev = list_get_instance(link,
+                    dev_class_info_t, link);
+
+                if (str_cmp(dev->dev_name, dev_name) == 0) {
+                        return dev;
+                }
+        }
+
+        return NULL;
+}
+
 void init_class_list(class_list_t *class_list)
 {

uspace/srv/devman/devman.h

@@ -338 +338 @@
 extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
 extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
+extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
+extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
 
 /* Device tree */
@@ -359 +361 @@
 extern dev_class_t *get_dev_class(class_list_t *, char *);
 extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
+extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
 extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
 

uspace/srv/devman/main.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
 #include <bool.h>
 #include <fibril_synch.h>
@@ -51 +52 @@
 #include <sys/stat.h>
 #include <ctype.h>
+#include <io/log.h>
 #include <ipc/devman.h>
 #include <ipc/driver.h>
@@ -71 +73 @@
         driver_t *driver = NULL;
 
-        printf(NAME ": devman_driver_register \n");
+        log_msg(LVL_DEBUG, "devman_driver_register");
         
         iid = async_get_call(&icall);
@@ -88 +90 @@
         }
 
-        printf(NAME ": the %s driver is trying to register by the service.\n",
+        log_msg(LVL_DEBUG, "The `%s' driver is trying to register.",
             drv_name);
         
@@ -95 +97 @@
         
         if (driver == NULL) {
-                printf(NAME ": no driver named %s was found.\n", drv_name);
+                log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name);
                 free(drv_name);
                 drv_name = NULL;
@@ -106 +108 @@
         
         /* Create connection to the driver. */
-        printf(NAME ":  creating connection to the %s driver.\n", driver->name);
+        log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.",
+            driver->name);
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
@@ -118 +121 @@
         set_driver_phone(driver, IPC_GET_ARG5(call));
         
-        printf(NAME ": the %s driver was successfully registered as running.\n",
+        log_msg(LVL_NOTE, 
+            "The `%s' driver was successfully registered as running.",
             driver->name);
         
@@ -142 +146 @@
         callid = async_get_call(&call);
         if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
-                printf(NAME ": ERROR: devman_receive_match_id - invalid "
-                    "protocol.\n");
+                log_msg(LVL_ERROR, 
+                    "Invalid protocol when trying to receive match id.");
                 async_answer_0(callid, EINVAL); 
                 delete_match_id(match_id);
@@ -150 +154 @@
         
         if (match_id == NULL) {
-                printf(NAME ": ERROR: devman_receive_match_id - failed to "
-                    "allocate match id.\n");
+                log_msg(LVL_ERROR, "Failed to allocate match id.");
                 async_answer_0(callid, ENOMEM);
                 return ENOMEM;
@@ -165 +168 @@
         if (rc != EOK) {
                 delete_match_id(match_id);
-                printf(NAME ": devman_receive_match_id - failed to receive "
-                    "match id string.\n");
+                log_msg(LVL_ERROR, "Failed to receive match id string: %s.",
+                    str_error(rc));
                 return rc;
         }
@@ -172 +175 @@
         list_append(&match_id->link, &match_ids->ids);
         
-        printf(NAME ": received match id '%s', score = %d \n",
+        log_msg(LVL_DEBUG, "Received match id `%s', score %d.",
             match_id->id, match_id->score);
         return rc;
@@ -228 +231 @@
         if (ftype != fun_inner && ftype != fun_exposed) {
                 /* Unknown function type */
-                printf(NAME ": Error, unknown function type provided by driver!\n");
+                log_msg(LVL_ERROR, 
+                    "Unknown function type %d provided by driver.",
+                    (int) ftype);
 
                 fibril_rwlock_write_unlock(&tree->rwlock);
@@ -243 +248 @@
         }
         
+        /* Check that function with same name is not there already. */
+        if (find_fun_node_in_device(pdev, fun_name) != NULL) {
+                fibril_rwlock_write_unlock(&tree->rwlock);
+                async_answer_0(callid, EEXISTS);
+                printf(NAME ": Warning, driver tried to register `%s' twice.\n",
+                    fun_name);
+                free(fun_name);
+                return;
+        }
+
         fun_node_t *fun = create_fun_node();
         if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) {
@@ -265 +280 @@
         fibril_rwlock_write_unlock(&tree->rwlock);
         
-        printf(NAME ": devman_add_function %s\n", fun->pathname);
+        log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname);
         
         devman_receive_match_ids(match_count, &fun->match_ids);
@@ -347 +362 @@
         devmap_register_class_dev(class_info);
         
-        printf(NAME ": function'%s' added to class '%s', class name '%s' was "
-            "asigned to it\n", fun->pathname, class_name, class_info->dev_name);
+        log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.",
+            fun->pathname, class_name, class_info->dev_name);
 
         async_answer_0(callid, EOK);
@@ -363 +378 @@
         
         initialize_running_driver(driver, &device_tree);
-        printf(NAME ": the %s driver was successfully initialized. \n",
+        log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.",
             driver->name);
         return 0;
@@ -385 +400 @@
         fid_t fid = fibril_create(init_running_drv, driver);
         if (fid == 0) {
-                printf(NAME ": Error creating fibril for the initialization of "
-                    "the newly registered running driver.\n");
+                log_msg(LVL_ERROR, "Failed to create initialization fibril " \
+                    "for driver `%s'.", driver->name);
                 return;
         }
@@ -438 +453 @@
 }
 
+/** Find handle for the device instance identified by device class name. */
+static void devman_function_get_handle_by_class(ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        char *classname;
+        char *devname;
+
+        int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                free(classname);
+                async_answer_0(iid, rc);
+                return;
+        }
+
+
+        fun_node_t *fun = find_fun_node_by_class(&class_list,
+            classname, devname);
+
+        free(classname);
+        free(devname);
+
+        if (fun == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+
+        async_answer_1(iid, EOK, fun->handle);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -457 +506 @@
                         devman_function_get_handle(callid, &call);
                         break;
+                case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
+                        devman_function_get_handle_by_class(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOENT);
@@ -484 +536 @@
          */
         if (dev == NULL) {
-                printf(NAME ": devman_forward error - no device or function with "
-                    "handle %" PRIun " was found.\n", handle);
+                log_msg(LVL_ERROR, "IPC forwarding failed - no device or "
+                    "function with handle %" PRIun " was found.", handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -491 +543 @@
 
         if (fun == NULL && !drv_to_parent) {
-                printf(NAME ": devman_forward error - cannot connect to "
-                    "handle %" PRIun ", refers to a device.\n", handle);
+                log_msg(LVL_ERROR, NAME ": devman_forward error - cannot "
+                    "connect to handle %" PRIun ", refers to a device.",
+                    handle);
                 async_answer_0(iid, ENOENT);
                 return;
@@ -513 +566 @@
         
         if (driver == NULL) {
-                printf(NAME ": devman_forward error - the device %" PRIun \
-                    " (%s) is not in usable state.\n",
+                log_msg(LVL_ERROR, "IPC forwarding refused - " \
+                    "the device %" PRIun "(%s) is not in usable state.",
                     handle, dev->pfun->pathname);
                 async_answer_0(iid, ENOENT);
@@ -527 +580 @@
         
         if (driver->phone <= 0) {
-                printf(NAME ": devman_forward: cound not forward to driver %s ",
-                    driver->name);
-                printf("the driver's phone is %" PRIun ").\n", driver->phone);
+                log_msg(LVL_ERROR, 
+                    "Could not forward to driver `%s' (phone is %d).",
+                    driver->name, (int) driver->phone);
                 async_answer_0(iid, EINVAL);
                 return;
@@ -535 +588 @@
 
         if (fun != NULL) {
-                printf(NAME ": devman_forward: forward connection to function %s to "
-                    "driver %s.\n", fun->pathname, driver->name);
+                log_msg(LVL_DEBUG, 
+                    "Forwarding request for `%s' function to driver `%s'.",
+                    fun->pathname, driver->name);
         } else {
-                printf(NAME ": devman_forward: forward connection to device %s to "
-                    "driver %s.\n", dev->pfun->pathname, driver->name);
+                log_msg(LVL_DEBUG, 
+                    "Forwarding request for `%s' device to driver `%s'.",
+                    dev->pfun->pathname, driver->name);
         }
 
@@ -571 +626 @@
         async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0,
             IPC_FF_NONE);
-        printf(NAME ": devman_connection_devmapper: forwarded connection to "
-            "device %s to driver %s.\n", fun->pathname, dev->drv->name);
+        log_msg(LVL_DEBUG, 
+            "Forwarding devmapper request for `%s' function to driver `%s'.",
+            fun->pathname, dev->drv->name);
 }
 
@@ -607 +663 @@
 static bool devman_init(void)
 {
-        printf(NAME ": devman_init - looking for available drivers.\n");
+        log_msg(LVL_DEBUG, "devman_init - looking for available drivers.");
         
         /* Initialize list of available drivers. */
@@ -613 +669 @@
         if (lookup_available_drivers(&drivers_list,
             DRIVER_DEFAULT_STORE) == 0) {
-                printf(NAME " no drivers found.");
+                log_msg(LVL_FATAL, "No drivers found.");
                 return false;
         }
 
-        printf(NAME ": devman_init  - list of drivers has been initialized.\n");
+        log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized.");
 
         /* Create root device node. */
         if (!init_device_tree(&device_tree, &drivers_list)) {
-                printf(NAME " failed to initialize device tree.");
+                log_msg(LVL_FATAL, "Failed to initialize device tree.");
                 return false;
         }
@@ -642 +698 @@
         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()) {
-                printf(NAME ": Error while initializing service\n");
+                log_msg(LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
@@ -651 +712 @@
 
         /* Register device manager at naming service. */
-        if (service_register(SERVICE_DEVMAN) != EOK)
+        if (service_register(SERVICE_DEVMAN) != EOK) {
+                log_msg(LVL_ERROR, "Failed registering as a service.");
                 return -1;
-
-        printf(NAME ": Accepting connections\n");
+        }
+
+        printf(NAME ": Accepting connections.\n");
         async_manager();
 

uspace/srv/devmap/devmap.c

@@ -551 +551 @@
         if (devmap_device_find_name(namespace->name, device->name) != NULL) {
                 printf("%s: Device '%s/%s' already registered\n", NAME,
-                    device->namespace->name, device->name);
+                    namespace->name, device->name);
                 devmap_namespace_destroy(namespace);
                 fibril_mutex_unlock(&devices_list_mutex);