WebSVN – HelenOS – Diff – /branches/network/uspace/lib/libblock/libblock.c

 typedef struct {
     fibril_mutex_t lock;
     size_t block_size;      /**< Block size. */
     unsigned block_count;       /**< Total number of blocks. */
+    unsigned blocks_cached;     /**< Number of cached blocks. */
     hash_table_t block_hash;
     link_t free_head;
     enum cache_mode mode;
 } cache_t;
 typedef struct {
     link_t link;
     dev_handle_t dev_handle;
     int dev_phone;
+    fibril_mutex_t com_area_lock;
     void *com_area;
     size_t com_size;
     void *bb_buf;
     off_t bb_off;
     size_t bb_size;
     cache_t *cache;
 } devcon_t;
-static int write_block(devcon_t *devcon, bn_t boff, size_t block_size,
+static int read_block(devcon_t *devcon, bn_t boff, size_t block_size);
-    const void *src);
+static int write_block(devcon_t *devcon, bn_t boff, size_t block_size);
 static devcon_t *devcon_search(dev_handle_t dev_handle)
+{
     link_t *cur;
         return ENOMEM;
     link_initialize(&devcon->link);
     devcon->dev_handle = dev_handle;
     devcon->dev_phone = dev_phone;
+    fibril_mutex_initialize(&devcon->com_area_lock);
     devcon->com_area = com_area;
     devcon->com_size = com_size;
     devcon->bb_buf = NULL;
     devcon->bb_off = 0;
     devcon->bb_size = 0;
         return EEXIST;
     bb_buf = malloc(size);
     if (!bb_buf)
         return ENOMEM;
-    off_t bufpos = 0;
-    size_t buflen = 0;
-    rc = block_read(dev_handle, &bufpos, &buflen, &off,
+    fibril_mutex_lock(&devcon->com_area_lock);
-        bb_buf, size, size);
+    rc = read_block(devcon, 0, size);
     if (rc != EOK) {
+        fibril_mutex_unlock(&devcon->com_area_lock);
             free(bb_buf);
         return rc;
+    }
+    memcpy(bb_buf, devcon->com_area, size);
+    fibril_mutex_unlock(&devcon->com_area_lock);
     devcon->bb_buf = bb_buf;
     devcon->bb_off = off;
     devcon->bb_size = size;
     return EOK;
     fibril_mutex_initialize(&cache->lock);
     list_initialize(&cache->free_head);
     cache->block_size = size;
     cache->block_count = blocks;
+    cache->blocks_cached = 0;
     cache->mode = mode;
     if (!hash_table_create(&cache->block_hash, CACHE_BUCKETS, 1,
         &cache_ops)) {
         free(cache);
     devcon->cache = cache;
     return EOK;
+}
+#define CACHE_LO_WATERMARK  10
+#define CACHE_HI_WATERMARK  20
 static bool cache_can_grow(cache_t *cache)
+{
+    if (cache->blocks_cached < CACHE_LO_WATERMARK)
+        return true;
+    if (!list_empty(&cache->free_head))
+        return false;
     return true;
+}
 static void block_initialize(block_t *b)
+{
     devcon_t *devcon;
     cache_t *cache;
     block_t *b;
     link_t *l;
     unsigned long key = boff;
+    bn_t oboff;
     devcon = devcon_search(dev_handle);
     assert(devcon);
     assert(devcon->cache);
     } else {
         /*
          * The block was not found in the cache.
          */
         int rc;
-        off_t bufpos = 0;
-        size_t buflen = 0;
-        off_t pos = boff * cache->block_size;
         bool sync = false;
         if (cache_can_grow(cache)) {
             /*
              * We can grow the cache by allocating new blocks.
             b->data = malloc(cache->block_size);
             if (!b->data) {
                 free(b);
                 goto recycle;
+            }
+            cache->blocks_cached++;
         } else {
             /*
              * Try to recycle a block from the free list.
              */
             unsigned long temp_key;
 recycle:
             assert(!list_empty(&cache->free_head));
             l = cache->free_head.next;
             list_remove(l);
-            b = hash_table_get_instance(l, block_t, hash_link);
+            b = list_get_instance(l, block_t, free_link);
             sync = b->dirty;
+            oboff = b->boff;
             temp_key = b->boff;
             hash_table_remove(&cache->block_hash, &temp_key, 1);
+        }
         block_initialize(b);
         if (sync) {
             /*
              * The block is dirty and needs to be written back to
              * the device before we can read in the new contents.
              */
-            abort();    /* TODO: block_write() */
+            fibril_mutex_lock(&devcon->com_area_lock);
+            memcpy(devcon->com_area, b->data, b->size);
+            rc = write_block(devcon, oboff, cache->block_size);
+            assert(rc == EOK);
+            fibril_mutex_unlock(&devcon->com_area_lock);
+        }
         if (!(flags & BLOCK_FLAGS_NOREAD)) {
             /*
              * The block contains old or no data. We need to read
              * the new contents from the device.
              */
-            rc = block_read(dev_handle, &bufpos, &buflen, &pos,
+            fibril_mutex_lock(&devcon->com_area_lock);
-                b->data, cache->block_size, cache->block_size);
+            rc = read_block(devcon, b->boff, cache->block_size);
             assert(rc == EOK);
+            memcpy(b->data, devcon->com_area, cache->block_size);
+            fibril_mutex_unlock(&devcon->com_area_lock);
+        }
         fibril_mutex_unlock(&b->lock);
+    }
     return b;
     cache = devcon->cache;
     fibril_mutex_lock(&cache->lock);
     fibril_mutex_lock(&block->lock);
     if (!--block->refcnt) {
         /*
-         * Last reference to the block was dropped, put the block on the
+         * Last reference to the block was dropped. Either free the
+         * block or put it on the free list.
+         */
+        if (cache->blocks_cached > CACHE_HI_WATERMARK) {
+            /*
+             * Currently there are too many cached blocks.
+             */
+            if (block->dirty) {
+                fibril_mutex_lock(&devcon->com_area_lock);
+                memcpy(devcon->com_area, block->data,
+                    block->size);
+                rc = write_block(devcon, block->boff,
+                    block->size);
+                assert(rc == EOK);
+                fibril_mutex_unlock(&devcon->com_area_lock);
+            }
+            /*
+             * Take the block out of the cache and free it.
+             */
+            unsigned long key = block->boff;
+            hash_table_remove(&cache->block_hash, &key, 1);
-         * free list.
+            free(block);
+            free(block->data);
+            cache->blocks_cached--;
+            fibril_mutex_unlock(&cache->lock);
+            return;
+        }
+        /*
+         * Put the block on the free list.
          */
         list_append(&block->free_link, &cache->free_head);
         if (cache->mode != CACHE_MODE_WB && block->dirty) {
+            fibril_mutex_lock(&devcon->com_area_lock);
-            rc = write_block(devcon, block->boff, block->size,
+            memcpy(devcon->com_area, block->data, block->size);
-                block->data);
+            rc = write_block(devcon, block->boff, block->size);
             assert(rc == EOK);
+            fibril_mutex_unlock(&devcon->com_area_lock);
             block->dirty = false;
+        }
+    }
     fibril_mutex_unlock(&block->lock);
     fibril_mutex_unlock(&cache->lock);
+}
-/** Read data from a block device.
+/** Read sequential data from a block device.
+ *
  * @param dev_handle    Device handle of the block device.
  * @param bufpos    Pointer to the first unread valid offset within the
  *          communication buffer.
  * @param buflen    Pointer to the number of unread bytes that are ready in
  * @param size      Size of the destination buffer.
  * @param block_size    Block size to be used for the transfer.
+ *
  * @return      EOK on success or a negative return code on failure.
  */
-int
-block_read(dev_handle_t dev_handle, off_t *bufpos, size_t *buflen, off_t *pos,
+int block_seqread(dev_handle_t dev_handle, off_t *bufpos, size_t *buflen,
-    void *dst, size_t size, size_t block_size)
+    off_t *pos, void *dst, size_t size, size_t block_size)
+{
     off_t offset = 0;
     size_t left = size;
     devcon_t *devcon = devcon_search(dev_handle);
     assert(devcon);
+    fibril_mutex_lock(&devcon->com_area_lock);
     while (left > 0) {
         size_t rd;
         if (*bufpos + left < *buflen)
             rd = left;
             left -= rd;
+        }
         if (*bufpos == (off_t) *buflen) {
             /* Refill the communication buffer with a new block. */
-            ipcarg_t retval;
+            int rc;
-            int rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK,
-                *pos / block_size, block_size, &retval);
+            rc = read_block(devcon, *pos / block_size, block_size);
-            if ((rc != EOK) || (retval != EOK))
+            if (rc != EOK) {
-                return (rc != EOK ? rc : (int) retval);
+                fibril_mutex_unlock(&devcon->com_area_lock);
+                return rc;
+            }
             *bufpos = 0;
             *buflen = block_size;
+        }
+    }
+    fibril_mutex_unlock(&devcon->com_area_lock);
     return EOK;
+}
+/** Read block from block device.
+ *
+ * @param devcon    Device connection.
+ * @param boff      Block index.
+ * @param block_size    Block size.
+ * @param src       Buffer for storing the data.
+ *
+ * @return      EOK on success or negative error code on failure.
+ */
+static int read_block(devcon_t *devcon, bn_t boff, size_t block_size)
+{
+    ipcarg_t retval;
+    int rc;
+    assert(devcon);
+    rc = async_req_2_1(devcon->dev_phone, BD_READ_BLOCK, boff, block_size,
+        &retval);
+    if ((rc != EOK) || (retval != EOK))
+        return (rc != EOK ? rc : (int) retval);
+    return EOK;
+}
 /** Write block to block device.
+ *
  * @param devcon    Device connection.
  * @param boff      Block index.
  * @param block_size    Block size.
  * @param src       Buffer containing the data to write.
+ *
  * @return      EOK on success or negative error code on failure.
  */
-static int write_block(devcon_t *devcon, bn_t boff, size_t block_size,
+static int write_block(devcon_t *devcon, bn_t boff, size_t block_size)
-    const void *src)
+{
     ipcarg_t retval;
     int rc;
     assert(devcon);
-    memcpy(devcon->com_area, src, block_size);
-    rc = async_req_2_1(devcon->dev_phone, BD_WRITE_BLOCK,
+    rc = async_req_2_1(devcon->dev_phone, BD_WRITE_BLOCK, boff, block_size,
-        boff, block_size, &retval);
+        &retval);
     if ((rc != EOK) || (retval != EOK))
         return (rc != EOK ? rc : (int) retval);
     return EOK;
+}

Subversion Repositories HelenOS

(root)/branches/network/uspace/lib/libblock/libblock.c – Rev 4581 → 4718