Changeset ab49a0d in mainline for uspace/srv

Timestamp:

2010-12-23T16:11:01Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

467bf40, 77cea41

Parents:

8dd039a (diff), 8240dc5a (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

Location:

uspace/srv

Files:

• devman/devman.c (modified) (8 diffs)
• devmap/devmap.c (modified) (10 diffs)
• fs/devfs/devfs_ops.c (modified) (7 diffs)
• net/tl/tcp/tcp.c (modified) (1 diff)
• vfs/vfs_lookup.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -392 +392 @@
         printf(NAME ": create_root_node\n");
 
+        fibril_rwlock_write_lock(&tree->rwlock);
         node = create_dev_node();
         if (node != NULL) {
@@ -401 +402 @@
                 tree->root_node = node;
         }
+        fibril_rwlock_write_unlock(&tree->rwlock);
 
         return node != NULL;
@@ -463 +465 @@
 /** Start a driver
  *
- * The driver's mutex is assumed to be locked.
- *
  * @param drv           The driver's structure.
  * @return              True if the driver's task is successfully spawned, false
@@ -473 +473 @@
         int rc;
 
+        assert(fibril_mutex_is_locked(&drv->driver_mutex));
+        
         printf(NAME ": start_driver '%s'\n", drv->name);
         
@@ -867 +869 @@
 /** Find the device node structure of the device witch has the specified handle.
  *
- * Device tree's rwlock should be held at least for reading.
- *
  * @param tree          The device tree where we look for the device node.
  * @param handle        The handle of the device.
@@ -876 +876 @@
 {
         unsigned long key = handle;
-        link_t *link = hash_table_find(&tree->devman_devices, &key);
+        link_t *link;
+        
+        assert(fibril_rwlock_is_locked(&tree->rwlock));
+        
+        link = hash_table_find(&tree->devman_devices, &key);
         return hash_table_get_instance(link, node_t, devman_link);
 }
@@ -932 +936 @@
 /** Insert new device into device tree.
  *
- * The device tree's rwlock should be already held exclusively when calling this
- * function.
- *
  * @param tree          The device tree.
  * @param node          The newly added device node. 
@@ -949 +950 @@
         assert(tree != NULL);
         assert(dev_name != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
         node->name = dev_name;

uspace/srv/devmap/devmap.c

@@ -46 +46 @@
 #include <str.h>
 #include <ipc/devmap.h>
+#include <assert.h>
 
 #define NAME          "devmap"
@@ -208 +209 @@
 }
 
-/** Find namespace with given name.
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Find namespace with given name. */
 static devmap_namespace_t *devmap_namespace_find_name(const char *name)
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -229 +228 @@
 /** Find namespace with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -238 +234 @@
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -248 +247 @@
 }
 
-/** Find device with given name.
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Find device with given name. */
 static devmap_device_t *devmap_device_find_name(const char *ns_name,
     const char *name)
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -271 +268 @@
 /** Find device with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -280 +274 @@
 {
         link_t *item;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -290 +287 @@
 }
 
-/** Create a namespace (if not already present)
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Create a namespace (if not already present). */
 static devmap_namespace_t *devmap_namespace_create(const char *ns_name)
 {
-        devmap_namespace_t *namespace = devmap_namespace_find_name(ns_name);
+        devmap_namespace_t *namespace;
+        
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+        
+        namespace = devmap_namespace_find_name(ns_name);
         if (namespace != NULL)
                 return namespace;
@@ -323 +319 @@
 }
 
-/** Destroy a namespace (if it is no longer needed)
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Destroy a namespace (if it is no longer needed). */
 static void devmap_namespace_destroy(devmap_namespace_t *namespace)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         if (namespace->refcnt == 0) {
                 list_remove(&(namespace->namespaces));
@@ -339 +332 @@
 }
 
-/** Increase namespace reference count by including device
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Increase namespace reference count by including device. */
 static void devmap_namespace_addref(devmap_namespace_t *namespace,
     devmap_device_t *device)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         device->namespace = namespace;
         namespace->refcnt++;
 }
 
-/** Decrease namespace reference count
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Decrease namespace reference count. */
 static void devmap_namespace_delref(devmap_namespace_t *namespace)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         namespace->refcnt--;
         devmap_namespace_destroy(namespace);
 }
 
-/** Unregister device and free it
- *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
- */
+/** Unregister device and free it. */
 static void devmap_device_unregister_core(devmap_device_t *device)
 {
+        assert(fibril_mutex_is_locked(&devices_list_mutex));
+
         devmap_namespace_delref(device->namespace);
         list_remove(&(device->devices));

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++;
                 }
@@ -564 +609 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -627 +673 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 ipc_callid_t callid;
@@ -696 +743 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 dev->refcount--;
                 
@@ -743 +791 @@
                 
                 device_t *dev = hash_table_get_instance(lnk, device_t, link);
+                assert(dev->phone >= 0);
                 
                 /* Make a request at the driver */

uspace/srv/net/tl/tcp/tcp.c

@@ -2085 +2085 @@
         if (!fibril) {
                 free(operation_timeout);
-                return EPARTY;  /* FIXME: use another EC */
-        }
+                return ENOMEM;
+        }
+
 //      fibril_mutex_lock(&socket_data->operation.mutex);
         /* Start the timeout fibril */

uspace/srv/vfs/vfs_lookup.c

@@ -179 +179 @@
         fibril_mutex_unlock(&plb_mutex);
         
-        if (((int) rc < EOK) || (!result))
+        if ((int) rc < EOK)
                 return (int) rc;
+
+        if (!result)
+                return EOK;
         
         result->triplet.fs_handle = (fs_handle_t) rc;