Changeset 398c4d7 in mainline for uspace/srv/devman/devman.c

Timestamp:

2010-12-01T23:51:29Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c245f16e

Parents:

2edcb63

Message:

More conservative locking in devman

Add mutex guard when accessing driver_t structure during driver assigning.

Added missing async_wait_for and removed extra mutex_unlock.

To speed-up answer time, driver start is done in separate fibril to avoid
blocking IPC connection fibril.

File:

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

uspace/srv/devman/devman.c

@@ -520 +520 @@
         fibril_mutex_lock(&driver->driver_mutex);
 
-        phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
+        phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);
 
         if (phone < 0) {
@@ -583 +583 @@
          * immediately and possibly started here as well.
          */
+        printf(NAME ": driver %s goes into running state.\n", driver->name);
         driver->state = DRIVER_RUNNING;
 
@@ -712 +713 @@
                 /* TODO handle error */
         }
-        
+
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
@@ -755 +756 @@
         attach_driver(node, drv);
         
+        fibril_mutex_lock(&drv->driver_mutex);
         if (drv->state == DRIVER_NOT_STARTED) {
                 /* Start the driver. */
                 start_driver(drv);
         }
-        
-        if (drv->state == DRIVER_RUNNING) {
+        fibril_mutex_unlock(&drv->driver_mutex);
+        
+        fibril_mutex_lock(&drv->driver_mutex);
+        bool is_running = drv->state == DRIVER_RUNNING;
+        fibril_mutex_unlock(&drv->driver_mutex);
+
+        if (is_running) {
                 /* Notify the driver about the new device. */
-                int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
+                int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);
                 if (phone > 0) {
                         add_device(phone, drv, node, tree);
@@ -924 +931 @@
         node->name = dev_name;
         if (!set_dev_path(node, parent)) {
-                fibril_rwlock_write_unlock(&tree->rwlock);
                 return false;
         }