Changes in / [23cdcc6f:6118ccaf] in mainline

Location:

uspace

Files:

• lib/c/generic/devmap.c (modified) (1 diff)
• srv/fs/devfs/devfs_ops.c (modified) (7 diffs)

uspace/lib/c/generic/devmap.c

@@ -279 +279 @@
         
         if (flags & IPC_FLAG_BLOCKING) {
-                phone = async_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
+                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
                     DEVMAP_CONNECT_TO_DEVICE, handle);
         } else {
-                phone = async_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
                     DEVMAP_CONNECT_TO_DEVICE, handle);
         }

uspace/srv/fs/devfs/devfs_ops.c

@@ -60 +60 @@
 typedef struct {
         devmap_handle_t handle;
-        int phone;              /**< When < 0, the structure is incomplete. */
+        int phone;
         size_t refcount;
         link_t link;
-        fibril_condvar_t cv;    /**< Broadcast when completed. */
 } device_t;
 
@@ -228 +227 @@
                         [DEVICES_KEY_HANDLE] = (unsigned long) node->handle
                 };
-                link_t *lnk;
-
+                
                 fibril_mutex_lock(&devices_mutex);
-restart:
-                lnk = hash_table_find(&devices, key);
+                link_t *lnk = hash_table_find(&devices, key);
                 if (lnk == NULL) {
                         device_t *dev = (device_t *) malloc(sizeof(device_t));
@@ -240 +237 @@
                         }
                         
-                        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;
                         }
                         
-                        /* Set the correct phone. */
+                        dev->handle = node->handle;
                         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++;
                 }
@@ -609 +564 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
-                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -673 +627 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
-                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -743 +696 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
-                assert(dev->phone >= 0);
                 dev->refcount--;
                 
@@ -791 +743 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
-                assert(dev->phone >= 0);
                 
                 /* Make a request at the driver */