Changeset f1ba5d6 in mainline

Timestamp:

2008-11-02T13:38:56Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e1c88d5

Parents:

0c243b4

Message:

Add block_cache_init().

Location:

uspace

Files:

• lib/libblock/libblock.c (modified) (6 diffs)
• lib/libblock/libblock.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/lib/libblock/libblock.c

@@ -49 +49 @@
 #include <futex.h>
 #include <libadt/list.h>
+#include <libadt/hash_table.h>
 
 /** Lock protecting the device connection list */
@@ -54 +55 @@
 /** Device connection list head. */
 static LIST_INITIALIZE(dcl_head);
+
+#define CACHE_BUCKETS_LOG2              10
+#define CACHE_BUCKETS                   (1 << CACHE_BUCKETS_LOG2)
+
+typedef struct {
+        futex_t lock;
+        size_t block_size;              /**< Block size. */
+        unsigned block_count;           /**< Total number of blocks. */
+        hash_table_t block_hash;
+        link_t free_head;
+} cache_t;
 
 typedef struct {
@@ -64 +76 @@
         off_t bb_off;
         size_t bb_size;
+        cache_t *cache;
 } devcon_t;
 
@@ -100 +113 @@
         devcon->bb_off = 0;
         devcon->bb_size = 0;
+        devcon->cache = NULL;
 
         futex_down(&dcl_lock);
@@ -168 +182 @@
         if (devcon->bb_buf)
                 free(devcon->bb_buf);
+
+        if (devcon->cache) {
+                hash_table_destroy(&devcon->cache->block_hash);
+                free(devcon->cache);
+        }
+
         munmap(devcon->com_area, devcon->com_size);
         ipc_hangup(devcon->dev_phone);
@@ -208 +228 @@
         assert(devcon);
         return devcon->bb_buf;
+}
+
+static hash_index_t cache_hash(unsigned long *key)
+{
+        return *key & (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->boff == *key;
+}
+
+static void cache_remove_callback(link_t *item)
+{
+}
+
+static hash_table_operations_t cache_ops = {
+        .hash = cache_hash,
+        .compare = cache_compare,
+        .remove_callback = cache_remove_callback
+};
+
+int block_cache_init(dev_handle_t dev_handle, size_t size, unsigned blocks)
+{
+        devcon_t *devcon = devcon_search(dev_handle);
+        cache_t *cache;
+        if (!devcon)
+                return ENOENT;
+        if (devcon->cache)
+                return EEXIST;
+        cache = malloc(sizeof(cache_t));
+        if (!cache)
+                return ENOMEM;
+        
+        futex_initialize(&cache->lock, 0);
+        list_initialize(&cache->free_head);
+        cache->block_size = size;
+        cache->block_count = blocks;
+
+        if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 1,
+            &cache_ops)) {
+                free(cache);
+                return ENOMEM;
+        }
+
+        devcon->cache = cache;
+        return EOK;
 }
 

uspace/lib/libblock/libblock.h

@@ -74 +74 @@
 extern void *block_bb_get(dev_handle_t);
 
+extern int block_cache_init(dev_handle_t, size_t, unsigned);
+
 extern block_t *block_get(dev_handle_t, off_t, size_t);
 extern void block_put(block_t *);

uspace/srv/fs/fat/fat_ops.c

@@ -462 +462 @@
         }
 
+        /* Initialize the block cache */
+        rc = block_cache_init(dev_handle, bps, 0 /* XXX */);
+        if (rc != EOK) {
+                block_fini(dev_handle);
+                ipc_answer_0(rid, rc);
+                return;
+        }
+
         rc = fat_idx_init_by_dev_handle(dev_handle);
         if (rc != EOK) {