Changeset b800b0e in mainline for uspace/lib/block/block.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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

File:

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

uspace/lib/block/block.c

@@ -62 +62 @@
 static LIST_INITIALIZE(dcl);
 
-#define CACHE_BUCKETS_LOG2  10
-#define CACHE_BUCKETS       (1 << CACHE_BUCKETS_LOG2)
 
 typedef struct {
@@ -233 +231 @@
 }
 
-static hash_index_t cache_hash(unsigned long *key)
-{
-        return MERGE_LOUP32(key[0], key[1]) & (CACHE_BUCKETS - 1);
-}
-
-static int cache_compare(unsigned long *key, hash_count_t keys, link_t *item)
-{
-        block_t *b = hash_table_get_instance(item, block_t, hash_link);
-        return b->lba == MERGE_LOUP32(key[0], key[1]);
-}
-
-static void cache_remove_callback(link_t *item)
-{
-}
-
-static hash_table_operations_t cache_ops = {
+static size_t cache_key_hash(void *key)
+{
+        aoff64_t *lba = (aoff64_t*)key;
+        return *lba;
+}
+
+static size_t cache_hash(const ht_link_t *item)
+{
+        block_t *b = hash_table_get_inst(item, block_t, hash_link);
+        return b->lba;
+}
+
+static bool cache_key_equal(void *key, const ht_link_t *item)
+{
+        aoff64_t *lba = (aoff64_t*)key;
+        block_t *b = hash_table_get_inst(item, block_t, hash_link);
+        return b->lba == *lba;
+}
+
+
+static hash_table_ops_t cache_ops = {
         .hash = cache_hash,
-        .compare = cache_compare,
-        .remove_callback = cache_remove_callback
+        .key_hash = cache_key_hash,
+        .key_equal = cache_key_equal,
+        .equal = NULL,
+        .remove_callback = NULL
 };
 
@@ -282 +287 @@
         cache->blocks_cluster = cache->lblock_size / devcon->pblock_size;
 
-        if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 2,
-            &cache_ops)) {
+        if (!hash_table_create(&cache->block_hash, 0, 0, &cache_ops)) {
                 free(cache);
                 return ENOMEM;
@@ -321 +325 @@
                 }
 
-                unsigned long key[2] = {
-                        LOWER32(b->lba),
-                        UPPER32(b->lba)
-                };
-                hash_table_remove(&cache->block_hash, key, 2);
+                hash_table_remove_item(&cache->block_hash, &b->hash_link);
                 
                 free(b->data);
@@ -357 +357 @@
         fibril_rwlock_initialize(&b->contents_lock);
         link_initialize(&b->free_link);
-        link_initialize(&b->hash_link);
 }
 
@@ -377 +376 @@
         cache_t *cache;
         block_t *b;
-        link_t *l;
-        unsigned long key[2] = {
-                LOWER32(ba),
-                UPPER32(ba)
-        };
+        link_t *link;
 
         int rc;
@@ -397 +392 @@
 
         fibril_mutex_lock(&cache->lock);
-        l = hash_table_find(&cache->block_hash, key);
-        if (l) {
+        ht_link_t *hlink = hash_table_find(&cache->block_hash, &ba);
+        if (hlink) {
 found:
                 /*
                  * We found the block in the cache.
                  */
-                b = hash_table_get_instance(l, block_t, hash_link);
+                b = hash_table_get_inst(hlink, block_t, hash_link);
                 fibril_mutex_lock(&b->lock);
                 if (b->refcnt++ == 0)
@@ -441 +436 @@
                                 goto out;
                         }
-                        l = list_first(&cache->free_list);
-                        b = list_get_instance(l, block_t, free_link);
+                        link = list_first(&cache->free_list);
+                        b = list_get_instance(link, block_t, free_link);
 
                         fibril_mutex_lock(&b->lock);
@@ -479 +474 @@
                                         goto retry;
                                 }
-                                l = hash_table_find(&cache->block_hash, key);
-                                if (l) {
+                                hlink = hash_table_find(&cache->block_hash, &ba);
+                                if (hlink) {
                                         /*
                                          * Someone else must have already
@@ -502 +497 @@
                          */
                         list_remove(&b->free_link);
-                        unsigned long temp_key[2] = {
-                                LOWER32(b->lba),
-                                UPPER32(b->lba)
-                        };
-                        hash_table_remove(&cache->block_hash, temp_key, 2);
+                        hash_table_remove_item(&cache->block_hash, &b->hash_link);
                 }
 
@@ -514 +505 @@
                 b->lba = ba;
                 b->pba = ba_ltop(devcon, b->lba);
-                hash_table_insert(&cache->block_hash, key, &b->hash_link);
+                hash_table_insert(&cache->block_hash, &b->hash_link);
 
                 /*
@@ -622 +613 @@
                          * Take the block out of the cache and free it.
                          */
-                        unsigned long key[2] = {
-                                LOWER32(block->lba),
-                                UPPER32(block->lba)
-                        };
-                        hash_table_remove(&cache->block_hash, key, 2);
+                        hash_table_remove_item(&cache->block_hash, &block->hash_link);
                         fibril_mutex_unlock(&block->lock);
                         free(block->data);