return b->priv.vt->readDirect(b, b->priv.blk_start + index, buf, offset, size);
}
+INLINE int kblock_writeBlock(struct KBlock *b, block_idx_t index, const void *buf)
+{
+ KB_ASSERT_METHOD(b, writeBlock);
+ ASSERT(index < b->blk_cnt);
+ return b->priv.vt->writeBlock(b, b->priv.blk_start + index, buf);
+}
+
INLINE size_t kblock_readBuf(struct KBlock *b, void *buf, size_t offset, size_t size)
{
KB_ASSERT_METHOD(b, readBuf);
return b->priv.vt->store(b, b->priv.blk_start + index);
}
+INLINE void kblock_setDirty(struct KBlock *b, bool dirty)
+{
+ if (dirty)
+ b->priv.flags |= KB_CACHE_DIRTY;
+ else
+ b->priv.flags &= ~KB_CACHE_DIRTY;
+}
+
size_t kblock_read(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
ASSERT(offset + size <= b->blk_size);
LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
- if (idx == b->priv.curr_blk)
+ if (kblock_buffered(b) && idx == b->priv.curr_blk)
return kblock_readBuf(b, buf, offset, size);
else
return kblock_readDirect(b, idx, buf, offset, size);
{
ASSERT(b);
- if (b->priv.cache_dirty)
+ if (!kblock_buffered(b))
+ return 0;
+
+ if (kblock_cacheDirty(b))
{
LOG_INFO("flushing block %d\n", b->priv.curr_blk);
if (kblock_store(b, b->priv.curr_blk) == 0)
- b->priv.cache_dirty = false;
+ kblock_setDirty(b, false);
else
return EOF;
}
LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
- if (!kblock_loadPage(b, idx))
- return 0;
+ if (kblock_buffered(b))
+ {
+ if (!kblock_loadPage(b, idx))
+ return 0;
- b->priv.cache_dirty = true;
- return kblock_writeBuf(b, buf, offset, size);
+ kblock_setDirty(b, true);
+ return kblock_writeBuf(b, buf, offset, size);
+ }
+ else
+ {
+ ASSERT(offset == 0);
+ ASSERT(size == b->blk_size);
+ return (kblock_writeBlock(b, idx, buf) == 0) ? size : 0;
+ }
}
-int kblock_copy(struct KBlock *b, block_idx_t idx1, block_idx_t idx2)
+int kblock_copy(struct KBlock *b, block_idx_t src, block_idx_t dest)
{
ASSERT(b);
- ASSERT(idx1 < b->blk_cnt);
- ASSERT(idx2 < b->blk_cnt);
+ ASSERT(src < b->blk_cnt);
+ ASSERT(dest < b->blk_cnt);
+ ASSERT(kblock_buffered(b));
- if (!kblock_loadPage(b, idx1))
+ if (!kblock_loadPage(b, src))
return EOF;
- b->priv.curr_blk = idx2;
- b->priv.cache_dirty = true;
+ b->priv.curr_blk = dest;
+ kblock_setDirty(b, true);
return 0;
}
-int kblock_swWriteBlock(struct KBlock *b, block_idx_t index, const void *buf)
-{
- return (kblock_write(b, index, buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
-}
-
-int kblock_swReadBlock(struct KBlock *b, block_idx_t index, void *buf)
-{
- return (kblock_read(b, index, buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
-}
-
int kblock_swLoad(struct KBlock *b, block_idx_t index)
{
- return kblock_readBlock(b, index, b->priv.buf);
+ return (kblock_readDirect(b, index, b->priv.buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
}
int kblock_swStore(struct KBlock *b, block_idx_t index)
{
ASSERT(buf);
ASSERT(offset + size <= b->blk_size);
-
+
memcpy(buf, (uint8_t *)b->priv.buf + offset, size);
return size;
}
memcpy((uint8_t *)b->priv.buf + offset, buf, size);
return size;
}
-
-size_t kblock_swReadDirect(struct KBlock *b, block_idx_t index, void *buf, size_t offset, size_t size)
-{
- ASSERT(buf);
- ASSERT(index < b->blk_cnt);
-
- if (!kblock_loadPage(b, index))
- return 0;
-
- return kblock_swReadBuf(b, buf, offset, size);
-}
\ No newline at end of file