#include <cfg/macros.h> /* MIN, MAX */
#include <cpu/byteorder.h> /* cpu_to_xx */
-#define LOG_LEVEL LOG_LVL_WARN
+#define LOG_LEVEL LOG_LVL_INFO
#define LOG_FORMAT LOG_FMT_VERBOSE
#include <cfg/log.h>
#include <string.h> /* memset, memmove */
-#ifdef _DEBUG
+#if LOG_LEVEL >= LOG_LVL_INFO
static void dumpPageArray(struct BattFsSuper *disk)
{
- kprintf("Page array dump:");
+ kprintf("Page array dump, free_page_start %d:", disk->free_page_start);
for (pgcnt_t i = 0; i < disk->page_count; i++)
{
if (!(i % 16))
* Header is actually a footer, and so
* resides at page end.
*/
- if (diskRead(disk, page, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
+ if (diskRead(disk, page, disk->data_size, buf, BATTFS_HEADER_LEN)
!= BATTFS_HEADER_LEN)
{
LOG_ERR("page[%d]\n", page);
* Header is actually a footer, and so
* resides at page end.
*/
- if (disk->bufferWrite(disk, disk->page_size - BATTFS_HEADER_LEN, buf, BATTFS_HEADER_LEN)
+ if (disk->bufferWrite(disk, disk->data_size, buf, BATTFS_HEADER_LEN)
!= BATTFS_HEADER_LEN)
{
LOG_ERR("writing to buffer\n");
return true;
}
+static bool getBufferHdr(struct BattFsSuper *disk, struct BattFsPageHeader *hdr)
+{
+ uint8_t buf[BATTFS_HEADER_LEN];
+
+ if (disk->bufferRead(disk, disk->data_size, buf, BATTFS_HEADER_LEN)
+ != BATTFS_HEADER_LEN)
+ {
+ LOG_ERR("reading from buffer\n");
+ return false;
+ }
+
+ disk_to_battfs(buf, hdr);
+
+ return true;
+}
+
/**
* Count the number of pages from
* inode 0 to \a inode in \a filelen_table.
return false;
/* Increase free space */
- disk->free_bytes += disk->page_size - BATTFS_HEADER_LEN;
+ disk->free_bytes += disk->data_size;
/* Check header FCS */
if (hdr.fcs == computeFcs(&hdr))
{
- ASSERT(hdr.fill <= disk->page_size - BATTFS_HEADER_LEN);
+ ASSERT(hdr.fill <= disk->data_size);
/* Page is valid and is owned by a file */
filelen_table[hdr.inode]++;
{
LOG_INFO("Flushing to disk page %d\n", disk->curr_page);
- if (!(setBufferHdr(disk, &disk->curr_hdr)
- && disk->erase(disk, disk->curr_page)
+ if (!(disk->erase(disk, disk->curr_page)
&& disk->save(disk, disk->curr_page)))
return false;
/**
* Load \a new_page from \a disk in disk page buffer.
* If a previuos page is still dirty in the buffer, will be
- * flushed first.
+ * flushed first. The new page header loaded will be put in \a new_hdr.
* \return true if ok, false on errors.
*/
-static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page)
+static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page, BattFsPageHeader *new_hdr)
{
if (disk->curr_page == new_page)
- return true;
+ return getBufferHdr(disk, new_hdr);
LOG_INFO("Loading page %d\n", new_page);
if (!(flushBuffer(disk)
- && disk->load(disk, new_page)))
+ && disk->load(disk, new_page)
+ && getBufferHdr(disk, new_hdr)))
return false;
disk->curr_page = new_page;
- /* Load current header */
- if (!readHdr(disk, disk->curr_page, &disk->curr_hdr))
- return false;
-
return true;
}
ASSERT(disk->save);
ASSERT(disk->erase);
ASSERT(disk->close);
- ASSERT(disk->page_size);
+ ASSERT(disk->page_size > BATTFS_HEADER_LEN);
+ /* Fill page_size with the usable space */
+ disk->data_size = disk->page_size - BATTFS_HEADER_LEN;
ASSERT(disk->page_count);
ASSERT(disk->page_count < PAGE_UNSET_SENTINEL - 1);
ASSERT(disk->page_array);
memset(filelen_table, 0, BATTFS_MAX_FILES * sizeof(pgoff_t));
disk->free_bytes = 0;
- disk->disk_size = (disk_size_t)(disk->page_size - BATTFS_HEADER_LEN) * disk->page_count;
+ disk->disk_size = (disk_size_t)disk->data_size * disk->page_count;
/* Initialize page buffer cache */
disk->cache_dirty = false;
disk->curr_page = 0;
disk->load(disk, disk->curr_page);
- readHdr(disk, disk->curr_page, &disk->curr_hdr);
/* Count pages per file */
if (!countDiskFilePages(disk, filelen_table))
LOG_ERR("filling page array\n");
return false;
}
+ #if LOG_LEVEL >= LOG_LVL_INFO
+ dumpPageArray(disk);
+ #endif
#warning TODO: shuffle free blocks
-
+ //#if LOG_LEVEL > LOG_LVL_INFO
+ // dumpPageArray(disk);
+ //#endif
/* Init list for opened files. */
LIST_INIT(&disk->file_opened_list);
return true;
}
-static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, pgoff_t pgoff)
+static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, pgoff_t pgoff, BattFsPageHeader *new_hdr)
{
if (disk->free_page_start >= disk->page_count)
{
LOG_INFO("Getting new page %d, pos %d\n", disk->page_array[disk->free_page_start], new_pos);
disk->curr_page = disk->page_array[disk->free_page_start++];
memmove(&disk->page_array[new_pos + 1], &disk->page_array[new_pos], (disk->free_page_start - new_pos - 1) * sizeof(pgcnt_t));
- #warning TODO: move other files!
+
+ Node *n;
+ /* Move following file start point one position ahead. */
+ FOREACH_NODE(n, &disk->file_opened_list)
+ {
+ BattFs *file = containerof(n, BattFs, link);
+ if (file->inode > inode)
+ {
+ LOG_INFO("Move file %d start pos\n", file->inode);
+ file->start++;
+ }
+ }
+
disk->page_array[new_pos] = disk->curr_page;
disk->cache_dirty = true;
- disk->curr_hdr.inode = inode;
- disk->curr_hdr.pgoff = pgoff;
- disk->curr_hdr.fill = 0;
- disk->curr_hdr.seq = 0;
- return true;
+ new_hdr->inode = inode;
+ new_hdr->pgoff = pgoff;
+ new_hdr->fill = 0;
+ new_hdr->seq = 0;
+ return setBufferHdr(disk, new_hdr);
}
/**
pgoff_t pg_offset;
pgaddr_t addr_offset;
pgaddr_t wr_len;
+ BattFsPageHeader curr_hdr;
+
+ if (fd->seek_pos < 0)
+ return total_write;
- #warning TODO seek_pos > size?
+ if ((fd->seek_pos / fdb->disk->data_size) > fdb->max_off)
+ {
+ /*
+ * Handle writing when seek pos if far over EOF,
+ * We need to allocate the missing pages first.
+ */
+ pgoff_t missing_pages = fd->seek_pos / fdb->disk->data_size - fdb->max_off;
+
+ LOG_INFO("missing pages: %d\n", missing_pages);
+ if (!loadPage(fdb->disk, fdb->start[fdb->max_off], &curr_hdr))
+ {
+ #warning TODO set error?
+ return total_write;
+ }
+
+ uint8_t dummy = 0xff;
+ /* Add missing pages to reach current seek_pos */
+ while (missing_pages--)
+ {
+ /* Update size and free space left */
+ fd->size += fdb->disk->data_size - curr_hdr.fill;
+ fdb->disk->free_bytes -= fdb->disk->data_size - curr_hdr.fill;
+
+ /* Fill empty space with 0xFF */
+ for (addr_offset = curr_hdr.fill; addr_offset < fdb->disk->data_size; addr_offset++)
+ {
+ if (fdb->disk->bufferWrite(fdb->disk, addr_offset, &dummy, 1) != 1)
+ {
+ #warning TODO set error?
+ }
+ }
+ curr_hdr.fill = fdb->disk->data_size;
+ setBufferHdr(fdb->disk, &curr_hdr);
+
+ /* Get the new page needed */
+ if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + fdb->max_off + 1, fdb->inode, fdb->max_off + 1, &curr_hdr))
+ return total_write;
+
+ fdb->max_off++;
+ }
+ /* Fix sizes for the last new page (could be only partially full) */
+ curr_hdr.fill = fd->seek_pos % fdb->disk->data_size;
+ setBufferHdr(fdb->disk, &curr_hdr);
+ fd->size += curr_hdr.fill;
+ fdb->disk->free_bytes -= curr_hdr.fill;
+ }
+ else if (!getBufferHdr(fdb->disk, &curr_hdr))
+ return total_write;
while (size)
{
- pg_offset = fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN);
- addr_offset = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
- wr_len = MIN(size, (size_t)(fdb->disk->page_size - BATTFS_HEADER_LEN - addr_offset));
+ pg_offset = fd->seek_pos / fdb->disk->data_size;
+ addr_offset = fd->seek_pos % fdb->disk->data_size;
+ wr_len = MIN(size, (size_t)(fdb->disk->data_size - addr_offset));
/* Handle write outside EOF */
if (pg_offset > fdb->max_off)
{
- if (!getNewPage(fdb->disk, (fdb->disk->page_array - fdb->start) + pg_offset, fdb->inode, pg_offset))
+ LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (fdb->start - fdb->disk->page_array) + pg_offset);
+ if (!getNewPage(fdb->disk, (fdb->start - fdb->disk->page_array) + pg_offset, fdb->inode, pg_offset, &curr_hdr))
return total_write;
fdb->max_off = pg_offset;
}
else if (fdb->start[pg_offset] != fdb->disk->curr_page)
{
LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], fdb->disk->page_array[fdb->disk->free_page_start]);
- if (!loadPage(fdb->disk, fdb->start[pg_offset]))
+ if (!loadPage(fdb->disk, fdb->start[pg_offset], &curr_hdr))
{
#warning TODO set error?
return total_write;
fdb->disk->page_array[fdb->disk->page_count - 1] = fdb->start[pg_offset];
/* Assign new page */
fdb->start[pg_offset] = fdb->disk->curr_page;
- fdb->disk->curr_hdr.seq++;
+ curr_hdr.seq++;
}
- LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", fdb->disk->curr_page, addr_offset, wr_len);
+ //LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", fdb->disk->curr_page, addr_offset, wr_len);
if (fdb->disk->bufferWrite(fdb->disk, addr_offset, buf, wr_len) != wr_len)
{
#warning TODO set error?
fd->seek_pos += wr_len;
total_write += wr_len;
buf += wr_len;
- fill_t fill_delta = MAX((int32_t)(addr_offset + wr_len) - fdb->disk->curr_hdr.fill, (int32_t)0);
+ fill_t fill_delta = MAX((int32_t)(addr_offset + wr_len) - curr_hdr.fill, (int32_t)0);
fdb->disk->free_bytes -= fill_delta;
- fdb->disk->curr_hdr.fill += fill_delta;
fd->size += fill_delta;
- LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", fdb->disk->free_bytes, fd->seek_pos, fd->size, fdb->disk->curr_hdr.fill);
+ curr_hdr.fill += fill_delta;
+
+ if (!setBufferHdr(fdb->disk, &curr_hdr))
+ return total_write;
+
+ //LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", fdb->disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill);
}
return total_write;
}
pgaddr_t addr_offset;
pgaddr_t read_len;
- size = MIN((kfile_off_t)size, fd->size - fd->seek_pos);
+ if (fd->seek_pos < 0)
+ return total_read;
+
+ size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0));
while (size)
{
- pg_offset = fd->seek_pos / (fdb->disk->page_size - BATTFS_HEADER_LEN);
- addr_offset = fd->seek_pos % (fdb->disk->page_size - BATTFS_HEADER_LEN);
- read_len = MIN(size, (size_t)(fdb->disk->page_size - BATTFS_HEADER_LEN - addr_offset));
+ pg_offset = fd->seek_pos / fdb->disk->data_size;
+ addr_offset = fd->seek_pos % fdb->disk->data_size;
+ read_len = MIN(size, (size_t)(fdb->disk->data_size - addr_offset));
+ //LOG_INFO("reading from page %d, offset %d, size %d\n", fdb->start[pg_offset], addr_offset, read_len);
/* Read from disk */
if (diskRead(fdb->disk, fdb->start[pg_offset], addr_offset, buf, read_len) != read_len)
{
#warning TODO set error?
}
+ #if _DEBUG
+ BattFsPageHeader hdr;
+ readHdr(fdb->disk, fdb->start[pg_offset], &hdr);
+ ASSERT(hdr.inode == fdb->inode);
+ #endif
+
size -= read_len;
fd->seek_pos += read_len;
total_read += read_len;
LOG_INFO("first %d, last %d, page %d\n", first, *last, page);
if (!readHdr(disk, disk->page_array[page], &hdr))
return false;
-
+ LOG_INFO("inode read: %d\n", hdr.inode);
fcs = computeFcs(&hdr);
if (hdr.fcs == fcs && hdr.inode == inode)
{
*last = page - hdr.pgoff;
+ LOG_INFO("Found: %d\n", *last);
return true;
}
else if (hdr.fcs == fcs && hdr.inode < inode)
else
*last = page - 1;
}
-
+ LOG_INFO("Not found: last %d\n", *last);
return false;
}
if (!(mode & BATTFS_CREATE))
return false;
/* Create the file */
- if (!(getNewPage(disk, start_pos, inode, 0)))
+ BattFsPageHeader hdr;
+ if (!(getNewPage(disk, start_pos, inode, 0, &hdr)))
return false;
}
fd->start = &disk->page_array[start_pos];
/* Fill file size */
if ((fd->fd.size = countFileSize(disk, fd->start, inode)) == EOF)
return false;
- fd->max_off = fd->fd.size / (disk->page_size - BATTFS_HEADER_LEN);
+ fd->max_off = fd->fd.size / disk->data_size;
/* Reset seek position */
fd->fd.seek_pos = 0;
projects / bertos.git / blobdiff