Changeset 01b87dc5 in mainline

Timestamp:

2010-12-21T16:07:59Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61cc94e

Parents:

c81b6f2

Message:

Deploy the fibril_{mutex,rwlock}_[*_]is_locked() functions in a few locations.

Location:

uspace

Files:

• lib/packet/generic/packet_server.c (modified) (4 diffs)
• srv/devman/devman.c (modified) (8 diffs)
• srv/devmap/devmap.c (modified) (10 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -135 +135 @@
 /** Creates a new packet of dimensions at least as given.
  *
- * Should be used only when the global data are locked.
- *
  * @param[in] length    The total length of the packet, including the header,
  *                      the addresses and the data of the packet.
@@ -153 +151 @@
         packet_t *packet;
         int rc;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
 
         // already locked
@@ -233 +233 @@
 /** Release the packet and returns it to the appropriate free packet queue.
  *
- * Should be used only when the global data are locked.
- *
  * @param[in] packet    The packet to be released.
  *
@@ -242 +240 @@
         int index;
         int result;
+
+        assert(fibril_mutex_is_locked(&ps_globals.lock));
 
         for (index = 0; (index < FREE_QUEUES_COUNT - 1) &&

uspace/srv/devman/devman.c

@@ -384 +384 @@
         printf(NAME ": create_root_node\n");
 
+        fibril_rwlock_write_lock(&tree->rwlock);
         node = create_dev_node();
         if (node != NULL) {
@@ -393 +394 @@
                 tree->root_node = node;
         }
+        fibril_rwlock_write_unlock(&tree->rwlock);
 
         return node != NULL;
@@ -455 +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
@@ -465 +465 @@
         int rc;
 
+        assert(fibril_mutex_is_locked(&drv->driver_mutex));
+        
         printf(NAME ": start_driver '%s'\n", drv->name);
         
@@ -859 +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.
@@ -868 +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);
 }
@@ -924 +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. 
@@ -941 +942 @@
         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));