Changeset 357b5f5 in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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.

File:

• uspace/srv/fs/devfs/devfs_ops.c (modified) (14 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -60 +60 @@
 typedef struct {
         devmap_handle_t handle;
-        int phone;
+        int phone;              /**< When < 0, the structure is incomplete. */
         size_t refcount;
         link_t link;
+        fibril_condvar_t cv;    /**< Broadcast when completed. */
 } device_t;
 
@@ -227 +228 @@
                         [DEVICES_KEY_HANDLE] = (unsigned long) node->handle
                 };
-                
+                link_t *lnk;
+
                 fibril_mutex_lock(&devices_mutex);
-                link_t *lnk = hash_table_find(&devices, key);
+restart:
+                lnk = hash_table_find(&devices, key);
                 if (lnk == NULL) {
                         device_t *dev = (device_t *) malloc(sizeof(device_t));
@@ -237 +240 @@
                         }
                         
+                        dev->handle = node->handle;
+                        dev->phone = -1;        /* mark as incomplete */
+                        dev->refcount = 1;
+                        fibril_condvar_initialize(&dev->cv);
+
+                        /*
+                         * Insert the incomplete device structure so that other
+                         * fibrils will not race with us when we drop the mutex
+                         * below.
+                         */
+                        hash_table_insert(&devices, key, &dev->link);
+
+                        /*
+                         * Drop the mutex to allow recursive devfs requests.
+                         */
+                        fibril_mutex_unlock(&devices_mutex);
+
                         int phone = devmap_device_connect(node->handle, 0);
+
+                        fibril_mutex_lock(&devices_mutex);
+
+                        /*
+                         * Notify possible waiters about this device structure
+                         * being completed (or destroyed).
+                         */
+                        fibril_condvar_broadcast(&dev->cv);
+
                         if (phone < 0) {
+                                /*
+                                 * Connecting failed, need to remove the
+                                 * entry and free the device structure.
+                                 */
+                                hash_table_remove(&devices, key, DEVICES_KEYS);
                                 fibril_mutex_unlock(&devices_mutex);
+
                                 free(dev);
                                 return ENOENT;
                         }
                         
-                        dev->handle = node->handle;
+                        /* Set the correct phone. */
                         dev->phone = phone;
-                        dev->refcount = 1;
-                        
-                        hash_table_insert(&devices, key, &dev->link);
                 } else {
                         device_t *dev = hash_table_get_instance(lnk, device_t, link);
+
+                        if (dev->phone < 0) {
+                                /*
+                                 * Wait until the device structure is completed
+                                 * and start from the beginning as the device
+                                 * structure might have entirely disappeared
+                                 * while we were not holding the mutex in
+                                 * fibril_condvar_wait().
+                                 */
+                                fibril_condvar_wait(&dev->cv, &devices_mutex);
+                                goto restart;
+                        }
+
                         dev->refcount++;
                 }
@@ -409 +454 @@
                 return false;
         
-        if (devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING) < 0)
-                return false;
-        
         return true;
 }
@@ -420 +462 @@
         
         /* Accept the mount options */
-        ipcarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
+        sysarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
             0, NULL);
         if (retval != EOK) {
@@ -564 +606 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -575 +618 @@
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
                     IPC_GET_ARG3(*request), &answer);
@@ -584 +627 @@
                 
                 /* Wait for reply from the driver. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 size_t bytes = IPC_GET_ARG1(answer);
@@ -627 +670 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -638 +682 @@
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
                     IPC_GET_ARG3(*request), &answer);
@@ -648 +692 @@
                 
                 /* Wait for reply from the driver. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 size_t bytes = IPC_GET_ARG1(answer);
@@ -696 +740 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 dev->refcount--;
                 
@@ -743 +788 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 /* Make a request at the driver */
                 ipc_call_t answer;
-                aid_t msg = async_send_2(dev->phone, IPC_GET_METHOD(*request),
+                aid_t msg = async_send_2(dev->phone, IPC_GET_IMETHOD(*request),
                     IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), &answer);
                 
@@ -752 +798 @@
                 
                 /* Wait for reply from the driver */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);