Changeset 463e734 in mainline

Timestamp:

2010-12-04T20:36:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4006447, 87b4baa

Parents:

42be09b

Message:

Serialization of devman::add_device

Also, the kernel limit for IPC messages was descreased back to 4.

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• uspace/srv/devman/devman.c (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -45 +45 @@
 /** Maximum active async calls per thread */
 #ifdef CONFIG_DEBUG
-        #define IPC_MAX_ASYNC_CALLS  8
+        #define IPC_MAX_ASYNC_CALLS  4
 #else
         #define IPC_MAX_ASYNC_CALLS  4000

uspace/srv/devman/devman.c

@@ -678 +678 @@
 }
 
+static FIBRIL_MUTEX_INITIALIZE(add_device_guard);
 
 /** Pass a device to running driver.
@@ -686 +687 @@
 void add_device(int phone, driver_t *drv, node_t *node, dev_tree_t *tree)
 {
+        fibril_mutex_lock(&add_device_guard);
+
         /*
          * We do not expect to have driver's mutex locked as we do not
@@ -716 +719 @@
         /* Wait for answer from the driver. */
         async_wait_for(req, &rc);
+
+        fibril_mutex_unlock(&add_device_guard);
 
         switch(rc) {