X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.c;h=4f4d48920e659051212f0dbc32fcba8da5e095f1;hb=e423e63cade618baf616a79b99aaab5de74ec76e;hp=4dde9243baeafe184115e65ed1cbdba60a559aae;hpb=2851469ef34a135047f09849503d52b1d46a499c;p=bertos.git diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c index 4dde9243..4f4d4892 100644 --- a/bertos/fs/battfs.c +++ b/bertos/fs/battfs.c @@ -32,20 +32,21 @@ * * \brief BattFS: a filesystem for embedded platforms (implementation). * - * \version $Id:$ + * \version $Id$ * * \author Francesco Sacchi * */ #include "battfs.h" - +#include "cfg/cfg_battfs.h" #include #include /* MIN, MAX */ +#include #include /* cpu_to_xx */ -#define LOG_LEVEL LOG_LVL_INFO -#define LOG_FORMAT LOG_FMT_VERBOSE +#define LOG_LEVEL BATTFS_LOG_LEVEL +#define LOG_FORMAT BATTFS_LOG_FORMAT #include #include /* memset, memmove */ @@ -279,7 +280,7 @@ static bool countDiskFilePages(struct BattFsSuper *disk, pgoff_t *filelen_table) disk->free_page_start++; } } - LOG_INFO("free_bytes:%d, free_page_start:%d\n", disk->free_bytes, disk->free_page_start); + LOG_INFO("free_bytes:%ld, free_page_start:%d\n", (long)disk->free_bytes, disk->free_page_start); return true; } @@ -382,7 +383,7 @@ static bool fillPageArray(struct BattFsSuper *disk, pgoff_t *filelen_table) { /* Invalid page, keep as free */ ASSERT(disk->page_array[curr_free_page] == PAGE_UNSET_SENTINEL); - LOG_INFO("Page %d invalid, keeping as free\n", page); + //LOG_INFO("Page %d invalid, keeping as free\n", page); disk->page_array[curr_free_page++] = page; } } @@ -438,20 +439,10 @@ static bool loadPage(struct BattFsSuper *disk, pgcnt_t new_page, BattFsPageHeade * \a disk. * \return false on errors, true otherwise. */ -bool battfs_init(struct BattFsSuper *disk) +bool battfs_mount(struct BattFsSuper *disk) { pgoff_t filelen_table[BATTFS_MAX_FILES]; - /* Sanity check */ - ASSERT(disk->open); - - /* Init disk device */ - if (!disk->open(disk)) - { - LOG_ERR("open error\n"); - return false; - } - /* Disk open must set all of these */ ASSERT(disk->read); ASSERT(disk->load); @@ -499,10 +490,14 @@ bool battfs_init(struct BattFsSuper *disk) #if LOG_LEVEL >= LOG_LVL_INFO dumpPageArray(disk); #endif - #warning TODO: shuffle free blocks - //#if LOG_LEVEL > LOG_LVL_INFO - // dumpPageArray(disk); - //#endif + #if CONFIG_BATTFS_SHUFFLE_FREE_PAGES + SHUFFLE(&disk->page_array[disk->free_page_start], disk->page_count - disk->free_page_start); + + LOG_INFO("Page array after shuffle:\n"); + #if LOG_LEVEL >= LOG_LVL_INFO + dumpPageArray(disk); + #endif + #endif /* Init list for opened files. */ LIST_INIT(&disk->file_opened_list); return true; @@ -527,6 +522,9 @@ bool battfs_fsck(struct BattFsSuper *disk) bool start = true; + /* Uneeded, the first time will be overwritten but useful to silence + * the warning for uninitialized value */ + FSCHECK(readHdr(disk, 0, &prev_hdr)); for (pgcnt_t page = 0; page < disk->page_count; page++) { FSCHECK(readHdr(disk, disk->page_array[page], &hdr)); @@ -574,7 +572,10 @@ static int battfs_flush(struct KFile *fd) if (flushBuffer(fdb->disk)) return 0; else + { + fdb->errors |= BATTFS_DISK_FLUSHBUF_ERR; return EOF; + } } /** @@ -585,9 +586,13 @@ static int battfs_fileclose(struct KFile *fd) { BattFs *fdb = BATTFS_CAST(fd); - battfs_flush(fd); - REMOVE(&fdb->link); - return 0; + if (battfs_flush(fd) == 0) + { + REMOVE(&fdb->link); + return 0; + } + else + return EOF; } @@ -595,7 +600,6 @@ static bool getNewPage(struct BattFsSuper *disk, pgcnt_t new_pos, inode_t inode, { if (SPACE_OVER(disk)) { - #warning TODO space over! LOG_ERR("No disk space available!\n"); return false; } @@ -643,25 +647,29 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) BattFsPageHeader curr_hdr; if (fd->seek_pos < 0) + { + fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR; return total_write; + } if (fd->seek_pos > fd->size) { /* Handle writing when seek pos if far over EOF */ if (!loadPage(disk, fdb->start[fdb->max_off], &curr_hdr)) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_LOADPAGE_ERR; return total_write; } /* Fill unused space of first page with 0s */ uint8_t dummy = 0; - pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, disk->data_size - curr_hdr.fill); + pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, (kfile_off_t)(disk->data_size - curr_hdr.fill)); while (zero_bytes--) { if (disk->bufferWrite(disk, curr_hdr.fill, &dummy, 1) != 1) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_BUFFERWR_ERR; + return total_write; } curr_hdr.fill++; fd->size++; @@ -683,7 +691,8 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) { if (disk->bufferWrite(disk, off, &dummy, 1) != 1) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_BUFFERWR_ERR; + return total_write; } } @@ -692,7 +701,10 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) zero_bytes = MIN((kfile_off_t)disk->data_size, fd->seek_pos - fd->size); /* Get the new page needed */ if (!getNewPage(disk, (fdb->start - disk->page_array) + fdb->max_off + 1, fdb->inode, fdb->max_off + 1, &curr_hdr)) + { + fdb->errors |= BATTFS_DISK_GETNEWPAGE_ERR; return total_write; + } /* Update size and free space left */ fd->size += zero_bytes; @@ -706,7 +718,10 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) } } else if (!getBufferHdr(disk, &curr_hdr)) + { + fdb->errors |= BATTFS_DISK_BUFFERRD_ERR; return total_write; + } while (size) { @@ -719,7 +734,11 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) { LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (int)((fdb->start - disk->page_array) + pg_offset)); if (!getNewPage(disk, (fdb->start - disk->page_array) + pg_offset, fdb->inode, pg_offset, &curr_hdr)) + { + fdb->errors |= BATTFS_DISK_GETNEWPAGE_ERR; return total_write; + } + fdb->max_off = pg_offset; } /* Handle cache load of a new page*/ @@ -728,12 +747,13 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) if (SPACE_OVER(disk)) { LOG_ERR("No disk space available!\n"); + fdb->errors |= BATTFS_DISK_SPACEOVER_ERR; return total_write; } LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], disk->page_array[disk->free_page_start]); if (!loadPage(disk, fdb->start[pg_offset], &curr_hdr)) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_LOADPAGE_ERR; return total_write; } @@ -752,7 +772,8 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) //LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", disk->curr_page, addr_offset, wr_len); if (disk->bufferWrite(disk, addr_offset, buf, wr_len) != wr_len) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_BUFFERWR_ERR; + return total_write; } disk->cache_dirty = true; @@ -766,7 +787,10 @@ static size_t battfs_write(struct KFile *fd, const void *_buf, size_t size) curr_hdr.fill += fill_delta; if (!setBufferHdr(disk, &curr_hdr)) + { + fdb->errors |= BATTFS_DISK_BUFFERWR_ERR; return total_write; + } //LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill); } @@ -790,9 +814,12 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size) pgaddr_t read_len; if (fd->seek_pos < 0) + { + fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR; return total_read; + } - size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0)); + size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, (kfile_off_t)0)); while (size) { @@ -804,7 +831,8 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size) /* Read from disk */ if (diskRead(disk, fdb->start[pg_offset], addr_offset, buf, read_len) != read_len) { - #warning TODO set error? + fdb->errors |= BATTFS_DISK_READ_ERR; + return total_read; } #if _DEBUG @@ -854,7 +882,7 @@ static bool findFile(BattFsSuper *disk, inode_t inode, pgcnt_t *last) else if (hdr.fcs == fcs && hdr.inode < inode) first = page + 1; else - *last = page - 1; + *last = page; } LOG_INFO("Not found: last %d\n", *last); return false; @@ -891,6 +919,19 @@ static file_size_t countFileSize(BattFsSuper *disk, pgcnt_t *start, inode_t inod return size; } +static int battfs_error(struct KFile *fd) +{ + BattFs *fdb = BATTFS_CAST(fd); + return fdb->errors; +} + + +static void battfs_clearerr(struct KFile *fd) +{ + BattFs *fdb = BATTFS_CAST(fd); + fdb->errors = 0; +} + /** * Open file \a inode from \a disk in \a mode. * File context is stored in \a fd. @@ -908,18 +949,27 @@ bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mo { LOG_INFO("file %d not found\n", inode); if (!(mode & BATTFS_CREATE)) + { + fd->errors |= BATTFS_FILE_NOT_FOUND_ERR; return false; + } /* Create the file */ BattFsPageHeader hdr; if (!(getNewPage(disk, start_pos, inode, 0, &hdr))) + { + fd->errors |= BATTFS_DISK_GETNEWPAGE_ERR; return false; + } } fd->start = &disk->page_array[start_pos]; LOG_INFO("Start pos %d\n", start_pos); /* Fill file size */ if ((fd->fd.size = countFileSize(disk, fd->start, inode)) == EOF) + { + fd->errors |= BATTFS_DISK_READ_ERR; return false; + } fd->max_off = fd->fd.size / disk->data_size; /* Reset seek position */ @@ -946,21 +996,19 @@ bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mo fd->fd.seek = kfile_genericSeek; fd->fd.write = battfs_write; -#warning TODO battfs_error, battfs_clearerr -#if 0 fd->fd.error = battfs_error; fd->fd.clearerr = battfs_clearerr; -#endif DB(fd->fd._type = KFT_BATTFS); return true; } + /** - * Close \a disk. + * Umount \a disk. */ -bool battfs_close(struct BattFsSuper *disk) +bool battfs_umount(struct BattFsSuper *disk) { Node *n; int res = 0;