Changeset 77cea41 in mainline for uspace/lib

Timestamp:

2010-12-24T17:00:35Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

700af62

Parents:

1522b42 (diff), ab49a0d (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 development/ changes

Location:

uspace/lib

Files:

• c/generic/async_rel.c (modified) (1 diff)
• c/generic/device/hw_res.c (modified) (1 diff)
• c/generic/devmap.c (modified) (1 diff)
• c/generic/fibril_synch.c (modified) (6 diffs)
• c/include/device/hw_res.h (modified) (1 diff)
• c/include/fibril_synch.h (modified) (2 diffs)
• packet/generic/packet_server.c (modified) (4 diffs)

uspace/lib/c/generic/async_rel.c

@@ -239 +239 @@
                  */
 retry:
-                rel_phone = ipc_connect_me_to(key_phone, 0, 0, 0);
+                rel_phone = async_connect_me_to(key_phone, 0, 0, 0);
                 if (rel_phone >= 0) {
                         /* success, do nothing */

uspace/lib/c/generic/device/hw_res.c

@@ -38 +38 @@
 #include <malloc.h>
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
+int get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources)
 {
         sysarg_t count = 0;
         int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE), GET_RESOURCE_LIST, &count);
         hw_resources->count = count;
-        if (EOK != rc) {
-                return false;
-        }
+        if (rc != EOK)
+                return rc;
         
         size_t size = count * sizeof(hw_resource_t);
         hw_resources->resources = (hw_resource_t *)malloc(size);
-        if (NULL == hw_resources->resources) {
-                return false;
-        }
+        if (!hw_resources->resources)
+                return ENOMEM;
         
         rc = async_data_read_start(dev_phone, hw_resources->resources, size);
-        if (EOK != rc) {
+        if (rc != EOK) {
                 free(hw_resources->resources);
                 hw_resources->resources = NULL;
-                return false;
+                return rc;
         }
                  
-        return true;     
+        return EOK;
 }
 

uspace/lib/c/generic/devmap.c

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

uspace/lib/c/generic/fibril_synch.c

@@ -139 +139 @@
 static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm)
 {
-        assert(fm->counter <= 0);
         if (fm->counter++ < 0) {
                 link_t *tmp;
@@ -165 +164 @@
 void fibril_mutex_unlock(fibril_mutex_t *fm)
 {
+        assert(fibril_mutex_is_locked(fm));
         futex_down(&async_futex);
         _fibril_mutex_unlock_unsafe(fm);
         futex_up(&async_futex);
+}
+
+bool fibril_mutex_is_locked(fibril_mutex_t *fm)
+{
+        bool locked = false;
+        
+        futex_down(&async_futex);
+        if (fm->counter <= 0) 
+                locked = true;
+        futex_up(&async_futex);
+        
+        return locked;
 }
 
@@ -230 +242 @@
 {
         futex_down(&async_futex);
-        assert(frw->readers || (frw->writers == 1));
         if (frw->readers) {
                 if (--frw->readers) {
@@ -296 +307 @@
 void fibril_rwlock_read_unlock(fibril_rwlock_t *frw)
 {
+        assert(fibril_rwlock_is_read_locked(frw));
         _fibril_rwlock_common_unlock(frw);
 }
@@ -301 +313 @@
 void fibril_rwlock_write_unlock(fibril_rwlock_t *frw)
 {
+        assert(fibril_rwlock_is_write_locked(frw));
         _fibril_rwlock_common_unlock(frw);
+}
+
+bool fibril_rwlock_is_read_locked(fibril_rwlock_t *frw)
+{
+        bool locked = false;
+
+        futex_down(&async_futex);
+        if (frw->readers)
+                locked = true;
+        futex_up(&async_futex);
+
+        return locked;
+}
+
+bool fibril_rwlock_is_write_locked(fibril_rwlock_t *frw)
+{
+        bool locked = false;
+
+        futex_down(&async_futex);
+        if (frw->writers) {
+                assert(frw->writers == 1);
+                locked = true;
+        }
+        futex_up(&async_futex);
+
+        return locked;
+}
+
+bool fibril_rwlock_is_locked(fibril_rwlock_t *frw)
+{
+        return fibril_rwlock_is_read_locked(frw) ||
+            fibril_rwlock_is_write_locked(frw);
 }
 
@@ -314 +359 @@
 {
         awaiter_t wdata;
+
+        assert(fibril_mutex_is_locked(fm));
 
         if (timeout < 0)

uspace/lib/c/include/device/hw_res.h

@@ -95 +95 @@
 
 
-bool get_hw_resources(int dev_phone, hw_resource_list_t *hw_resources);
-
-bool enable_interrupt(int dev_phone);
+extern int get_hw_resources(int, hw_resource_list_t *);
+extern bool enable_interrupt(int);
 
 

uspace/lib/c/include/fibril_synch.h

@@ -105 +105 @@
 extern bool fibril_mutex_trylock(fibril_mutex_t *);
 extern void fibril_mutex_unlock(fibril_mutex_t *);
+extern bool fibril_mutex_is_locked(fibril_mutex_t *);
 
 extern void fibril_rwlock_initialize(fibril_rwlock_t *);
@@ -111 +112 @@
 extern void fibril_rwlock_read_unlock(fibril_rwlock_t *);
 extern void fibril_rwlock_write_unlock(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_read_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_write_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_locked(fibril_rwlock_t *);
 
 extern void fibril_condvar_initialize(fibril_condvar_t *);

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) &&