Changeset b2d06fa in mainline for uspace/srv

Timestamp:

2010-12-25T17:14:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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) (14 diffs)
• devman/main.c (modified) (5 diffs)
• devmap/devmap.c (modified) (14 diffs)
• fs/devfs/devfs_ops.c (modified) (7 diffs)
• net/tl/tcp/tcp.c (modified) (2 diffs)
• vfs/vfs_lookup.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -62 +62 @@
 }
 
+static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+        dev_class_info_t *class_info
+            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
+        assert(class_info != NULL);
+
+        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
+}
+
 static void devices_remove_callback(link_t *item)
 {
@@ -75 +85 @@
         .hash = devices_hash,
         .compare = devmap_devices_compare,
+        .remove_callback = devices_remove_callback
+};
+
+static hash_table_operations_t devmap_devices_class_ops = {
+        .hash = devices_hash,
+        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -368 +384 @@
         printf(NAME ": create_root_node\n");
 
+        fibril_rwlock_write_lock(&tree->rwlock);
         node = create_dev_node();
         if (node != NULL) {
@@ -377 +394 @@
                 tree->root_node = node;
         }
+        fibril_rwlock_write_unlock(&tree->rwlock);
 
         return node != NULL;
@@ -439 +457 @@
 /** 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
@@ -449 +465 @@
         int rc;
 
+        assert(fibril_mutex_is_locked(&drv->driver_mutex));
+        
         printf(NAME ": start_driver '%s'\n", drv->name);
         
@@ -670 +688 @@
         }
         
-        devmap_device_register(devmap_pathname, &node->devmap_handle);
+        devmap_device_register_with_iface(devmap_pathname,
+            &node->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
         
         tree_add_devmap_device(tree, node);
@@ -842 +861 @@
 /** 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.
@@ -851 +868 @@
 {
         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);
 }
@@ -907 +928 @@
 /** 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. 
@@ -924 +942 @@
         assert(tree != NULL);
         assert(dev_name != NULL);
+        assert(fibril_rwlock_is_write_locked(&tree->rwlock));
         
         node->name = dev_name;
@@ -1042 +1061 @@
         
         info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
-        if (info != NULL)
+        if (info != NULL) {
                 memset(info, 0, sizeof(dev_class_info_t));
+                list_initialize(&info->dev_classes);
+                list_initialize(&info->devmap_link);
+                list_initialize(&info->link);
+        }
         
         return info;
@@ -1167 +1190 @@
         fibril_rwlock_initialize(&class_list->rwlock);
         hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
-            &devmap_devices_ops);
+            &devmap_devices_class_ops);
 }
 
@@ -1215 +1238 @@
         hash_table_insert(&class_list->devmap_devices, &key, &cli->devmap_link);
         fibril_rwlock_write_unlock(&class_list->rwlock);
+
+        assert(find_devmap_class_device(class_list, cli->devmap_handle) != NULL);
 }
 

uspace/srv/devman/main.c

@@ -281 +281 @@
          * handle.
          */
-        devmap_device_register(devmap_pathname, &cli->devmap_handle);
+        devmap_device_register_with_iface(devmap_pathname,
+            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
         
         /*
@@ -486 +487 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
         node_t *dev;
 
@@ -503 +504 @@
         }
         
-        printf(NAME ": devman_connection_devmapper: forward connection to "
-            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
         ipc_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0,
             IPC_FF_NONE);
+        printf(NAME ": devman_connection_devmapper: forwarded connection to "
+            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
 }
 
@@ -512 +513 @@
 static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-        /*
-         * Silly hack to enable the device manager to register as a driver by
-         * the device mapper. If the ipc method is not IPC_M_CONNECT_ME_TO, this
-         * is not the forwarded connection from naming service, so it must be a
-         * connection from the devmapper which thinks this is a devmapper-style
-         * driver. So pretend this is a devmapper-style driver. (This does not
-         * work for device with handle == IPC_M_CONNECT_ME_TO, because devmapper
-         * passes device handle to the driver as an ipc method.)
-         */
-        if (IPC_GET_IMETHOD(*icall) != IPC_M_CONNECT_ME_TO)
-                devman_connection_devmapper(iid, icall);
-
-        /*
-         * ipc method is IPC_M_CONNECT_ME_TO, so this is forwarded connection
-         * from naming service by which we registered as device manager, so be
-         * device manager.
-         */
-        
         /* Select interface. */
         switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
@@ -542 +525 @@
                 devman_forward(iid, icall, false);
                 break;
+        case DEVMAN_CONNECT_FROM_DEVMAP:
+                /* Someone connected through devmap node. */
+                devman_connection_devmapper(iid, icall);
+                break;
         case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
                 /* Connect client to selected device. */

uspace/srv/devmap/devmap.c

@@ -46 +46 @@
 #include <str.h>
 #include <ipc/devmap.h>
+#include <assert.h>
 
 #define NAME          "devmap"
@@ -99 +100 @@
         /** Device driver handling this device */
         devmap_driver_t *driver;
+        /** Use this interface when forwarding to driver. */
+        sysarg_t forward_interface;
 } devmap_device_t;
 
@@ -206 +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 =
@@ -227 +228 @@
 /** Find namespace with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -236 +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 =
@@ -246 +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 =
@@ -269 +268 @@
 /** Find device with given handle.
  *
- * The devices_list_mutex should be already held when
- * calling this function.
- *
  * @todo: use hash table
  *
@@ -278 +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 =
@@ -288 +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;
@@ -321 +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));
@@ -337 +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));
@@ -517 +503 @@
         }
         
+        /* Set the interface, if any. */
+        device->forward_interface = IPC_GET_ARG1(*icall);
+
         /* Get fqdn */
         char *fqdn;
@@ -566 +555 @@
         /* Get unique device handle */
         device->handle = devmap_create_handle();
-        
+
         devmap_namespace_addref(namespace, device);
         device->driver = driver;
@@ -617 +606 @@
         }
         
-        ipc_forward_fast(callid, dev->driver->phone, dev->handle,
-            IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+        if (dev->forward_interface == 0) {
+                ipc_forward_fast(callid, dev->driver->phone,
+                    dev->handle, 0, 0,
+                    IPC_FF_NONE);
+        } else {
+                ipc_forward_fast(callid, dev->driver->phone,
+                    dev->forward_interface, dev->handle, 0,
+                    IPC_FF_NONE);
+        }
         
         fibril_mutex_unlock(&devices_list_mutex);

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

@@ -1803 +1803 @@
                         fibril_rwlock_write_unlock(socket_data->local_lock);
 
+                        socket_data->state = TCP_SOCKET_SYN_SENT;
+
                         /* Send the packet */
                         printf("connecting %d\n", packet_get_id(packet));
@@ -2085 +2087 @@
         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;