Changeset cac458f in mainline for uspace/lib/block/libblock.c

Timestamp:

2011-06-22T01:59:39Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

41e2118

Parents:

79506d6 (diff), f1fae414 (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 libposix changes.

File:

• uspace/lib/block/libblock.c (modified) (12 diffs)

uspace/lib/block/libblock.c

@@ -60 +60 @@
 static FIBRIL_MUTEX_INITIALIZE(dcl_lock);
 /** Device connection list head. */
-static LIST_INITIALIZE(dcl_head);
+static LIST_INITIALIZE(dcl);
 
 #define CACHE_BUCKETS_LOG2  10
@@ -72 +72 @@
         unsigned blocks_cached;   /**< Number of cached blocks. */
         hash_table_t block_hash;
-        link_t free_head;
+        list_t free_list;
         enum cache_mode mode;
 } cache_t;
@@ -97 +97 @@
 static devcon_t *devcon_search(devmap_handle_t devmap_handle)
 {
-        link_t *cur;
-        
         fibril_mutex_lock(&dcl_lock);
         
-        for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
+        list_foreach(dcl, cur) {
                 devcon_t *devcon = list_get_instance(cur, devcon_t, link);
                 if (devcon->devmap_handle == devmap_handle) {
@@ -116 +114 @@
     size_t bsize, void *comm_area, size_t comm_size)
 {
-        link_t *cur;
         devcon_t *devcon;
         
@@ -138 +135 @@
         
         fibril_mutex_lock(&dcl_lock);
-        for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
+        list_foreach(dcl, cur) {
                 devcon_t *d = list_get_instance(cur, devcon_t, link);
                 if (d->devmap_handle == devmap_handle) {
@@ -146 +143 @@
                 }
         }
-        list_append(&devcon->link, &dcl_head);
+        list_append(&devcon->link, &dcl);
         fibril_mutex_unlock(&dcl_lock);
         return EOK;
@@ -294 +291 @@
         
         fibril_mutex_initialize(&cache->lock);
-        list_initialize(&cache->free_head);
+        list_initialize(&cache->free_list);
         cache->lblock_size = size;
         cache->block_count = blocks;
@@ -335 +332 @@
          * bother with the cache and block locks because we are single-threaded.
          */
-        while (!list_empty(&cache->free_head)) {
-                block_t *b = list_get_instance(cache->free_head.next,
+        while (!list_empty(&cache->free_list)) {
+                block_t *b = list_get_instance(list_first(&cache->free_list),
                     block_t, free_link);
 
@@ -367 +364 @@
         if (cache->blocks_cached < CACHE_LO_WATERMARK)
                 return true;
-        if (!list_empty(&cache->free_head))
+        if (!list_empty(&cache->free_list))
                 return false;
         return true;
@@ -456 +453 @@
                         unsigned long temp_key;
 recycle:
-                        if (list_empty(&cache->free_head)) {
+                        if (list_empty(&cache->free_list)) {
                                 fibril_mutex_unlock(&cache->lock);
                                 rc = ENOMEM;
                                 goto out;
                         }
-                        l = cache->free_head.next;
+                        l = list_first(&cache->free_list);
                         b = list_get_instance(l, block_t, free_link);
 
@@ -476 +473 @@
                                  */
                                 list_remove(&b->free_link);
-                                list_append(&b->free_link, &cache->free_head);
+                                list_append(&b->free_link, &cache->free_list);
                                 fibril_mutex_unlock(&cache->lock);
                                 fibril_mutex_lock(&devcon->comm_area_lock);
@@ -668 +665 @@
                         goto retry;
                 }
-                list_append(&block->free_link, &cache->free_head);
+                list_append(&block->free_link, &cache->free_list);
         }
         fibril_mutex_unlock(&block->lock);