Changeset 2edcb63 in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-11-30T15:16:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

398c4d7

Parents:

703d19c

Message:

Bugfixes in devman

First fix: the passing the devices to driver is even more careful on
variables that might be touch from more fibrils.

Second fix: add missing iterator incrementation when adding device to
class.

File:

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

uspace/srv/devman/devman.c

@@ -540 +540 @@
 
                 /*
+                 * We remove the device from the list to allow safe adding
+                 * of new devices (no one will touch our item this way).
+                 */
+                list_remove(link);
+
+                /*
                  * Unlock to avoid deadlock when adding device
                  * handled by itself.
@@ -552 +558 @@
                  */
                 fibril_mutex_lock(&driver->driver_mutex);
+
+                /*
+                 * Insert the device back.
+                 * The order is not relevant here so no harm is done
+                 * (actually, the order would be preserved in most cases).
+                 */
+                list_append(link, &driver->devices);
 
                 /*
@@ -1133 +1146 @@
         while (link != &class_list->classes) {
                 cl = list_get_instance(link, dev_class_t, link);
-                if (str_cmp(cl->name, class_name) == 0)
+                if (str_cmp(cl->name, class_name) == 0) {
                         return cl;
+                }
+                link = link->next;
         }