#if UNIT_TEST
-FILE *fp;
const char test_filename[]="battfs_disk.bin";
static uint8_t page_buffer[PAGE_SIZE];
-static bool disk_open(struct BattFsSuper *d)
-{
- fp = fopen(test_filename, "r+b");
- ASSERT(fp);
- fseek(fp, 0, SEEK_END);
- d->page_size = PAGE_SIZE;
- d->page_count = ftell(fp) / d->page_size;
- d->page_array = malloc(d->page_count * sizeof(pgcnt_t));
- //TRACEMSG("page_size:%d, page_count:%d\n", d->page_size, d->page_count);
- return (fp && d->page_array);
-}
-
static size_t disk_page_read(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t size)
{
//TRACEMSG("page:%d, addr:%d, size:%d", page, addr, size);
+ FILE *fp = (FILE *)d->disk_ctx;
fseek(fp, page * d->page_size + addr, SEEK_SET);
return fread(buf, 1, size, fp);
}
static bool disk_page_load(struct BattFsSuper *d, pgcnt_t page)
{
+ FILE *fp = (FILE *)d->disk_ctx;
//TRACEMSG("page:%d", page);
fseek(fp, page * d->page_size, SEEK_SET);
return fread(page_buffer, 1, d->page_size, fp) == d->page_size;
static bool disk_page_save(struct BattFsSuper *d, pgcnt_t page)
{
+ FILE *fp = (FILE *)d->disk_ctx;
//TRACEMSG("page:%d", page);
fseek(fp, page * d->page_size, SEEK_SET);
return fwrite(page_buffer, 1, d->page_size, fp) == d->page_size;
static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
{
+ FILE *fp = (FILE *)d->disk_ctx;
//TRACEMSG("page:%d", page);
fseek(fp, page * d->page_size, SEEK_SET);
static bool disk_close(struct BattFsSuper *d)
{
+ FILE *fp = (FILE *)d->disk_ctx;
//TRACE;
free(d->page_array);
return (fclose(fp) != EOF);
}
+static bool disk_open(struct BattFsSuper *d)
+{
+ d->read = disk_page_read;
+ d->load = disk_page_load;
+ d->bufferWrite = disk_buffer_write;
+ d->bufferRead = disk_buffer_read;
+ d->save = disk_page_save;
+ d->erase = disk_page_erase;
+ d->close = disk_close;
+
+ FILE *fp = fopen(test_filename, "r+b");
+ ASSERT(fp);
+ d->disk_ctx = fp;
+ fseek(fp, 0, SEEK_END);
+ d->page_size = PAGE_SIZE;
+ d->page_count = ftell(fp) / d->page_size;
+ d->page_array = malloc(d->page_count * sizeof(pgcnt_t));
+ //TRACEMSG("page_size:%d, page_count:%d\n", d->page_size, d->page_count);
+ return (fp && d->page_array);
+}
+
static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
{
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
for (int i = 0; i < disk->page_count; i++)
{
kprintf("%04d ", reference[i]);
}
kputchar('\n');
- battfs_close(disk);
+ battfs_umount(disk);
exit(2);
}
}
- battfs_close(disk);
+ ASSERT(battfs_fsck(disk));
+ battfs_umount(disk);
}
static void diskNew(BattFsSuper *disk)
TRACEMSG("2: disk full with 1 contiguos file\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_COUNT; i++)
{
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+ battfs_writeTestBlock(disk, i, 0, 0, disk->data_size, i);
ref[i] = i;
}
fclose(fp);
TRACEMSG("3: disk half full with 1 contiguos file, rest unformatted\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_COUNT / 2; i++)
{
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+ battfs_writeTestBlock(disk, i, 0, 0, disk->data_size, i);
ref[i] = i;
}
fseek(fp, FILE_SIZE / 2, SEEK_SET);
TRACEMSG("6: 1 file with 1 old seq num, 1 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
// page, inode, seq, fill, pgoff
- battfs_writeTestBlock(disk, 0, 0, 0, 0, 0);
- battfs_writeTestBlock(disk, 1, 0, 0, 0, 1);
- battfs_writeTestBlock(disk, 2, 0, 1, 0, 1);
+ battfs_writeTestBlock(disk, 0, 0, 0, disk->data_size, 0);
+ battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 1);
+ battfs_writeTestBlock(disk, 2, 0, 1, disk->data_size, 1);
disk->erase(disk, 3);
TRACEMSG("7: 1 file with 1 old seq num, 1 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
// page, inode, seq, fill, pgoff
- battfs_writeTestBlock(disk, 0, 0, 0, 0, 0);
- battfs_writeTestBlock(disk, 1, 0, 1, 0, 1);
- battfs_writeTestBlock(disk, 2, 0, 0, 0, 1);
+ battfs_writeTestBlock(disk, 0, 0, 0, disk->data_size, 0);
+ battfs_writeTestBlock(disk, 1, 0, 1, disk->data_size, 1);
+ battfs_writeTestBlock(disk, 2, 0, 0, disk->data_size, 1);
disk->erase(disk, 3);
fclose(fp);
TRACEMSG("8: 1 file with 1 old seq num, 1 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
// page, inode, seq, fill, pgoff
disk->erase(disk, 0);
- battfs_writeTestBlock(disk, 1, 0, 0, 0, 0);
- battfs_writeTestBlock(disk, 2, 0, 1, 0, 1);
- battfs_writeTestBlock(disk, 3, 0, 0, 0, 1);
+ battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 0);
+ battfs_writeTestBlock(disk, 2, 0, 1, disk->data_size, 1);
+ battfs_writeTestBlock(disk, 3, 0, 0, disk->data_size, 1);
fclose(fp);
TRACEMSG("9: 2 file with old seq num, 2 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
// page, inode, seq, fill, pgoff
disk->erase(disk, 0);
- battfs_writeTestBlock(disk, 1, 0, 0, 0, 0);
- battfs_writeTestBlock(disk, 2, 0, 3, 0, 1);
- battfs_writeTestBlock(disk, 3, 0, 0, 0, 1);
+ battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 0);
+ battfs_writeTestBlock(disk, 2, 0, 3, disk->data_size, 1);
+ battfs_writeTestBlock(disk, 3, 0, 0, disk->data_size, 1);
disk->erase(disk, 4);
- battfs_writeTestBlock(disk, 5, 4, 0, 0, 0);
- battfs_writeTestBlock(disk, 6, 4, 1, 0, 1);
- battfs_writeTestBlock(disk, 7, 4, 0, 0, 1);
+ battfs_writeTestBlock(disk, 5, 4, 0, disk->data_size, 0);
+ battfs_writeTestBlock(disk, 6, 4, 1, disk->data_size, 1);
+ battfs_writeTestBlock(disk, 7, 4, 0, disk->data_size, 1);
fclose(fp);
BattFs fd2;
TRACEMSG("10: open file test, inode 0 and inode 4\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
ASSERT(battfs_fileExists(disk, INODE));
ASSERT(LIST_HEAD(&disk->file_opened_list)->succ == &fd2.link);
ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
ASSERT(kfile_close(&fd2.fd) == 0);
+ ASSERT(kfile_error(&fd2.fd) == 0);
ASSERT(LIST_EMPTY(&disk->file_opened_list));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("10: passed\n");
}
TRACEMSG("11: read file test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(fd1.fd.seek_pos == sizeof(buf));
ASSERT(buf[i] == 0xff);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("11: passed\n");
}
TRACEMSG("12: read file test across page boundary and seek test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(fd1.fd.seek_pos = (kfile_off_t)fd1.fd.size);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("12: passed\n");
}
TRACEMSG("13: write file test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
for (size_t i = 0; i < sizeof(buf); i++)
buf[i] = i;
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(fd1.fd.seek_pos == sizeof(buf));
ASSERT(buf[i] == i);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("13: passed\n");
}
TRACEMSG("14: write file test across page boundary and seek test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
uint8_t val = 0;
ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("14: passed\n");
}
inode_t INODE = 0;
unsigned int MODE = BATTFS_CREATE;
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
for (int i = 0; i < FILE_SIZE / 2; i++)
ASSERT(kfile_putc(i, &fd1.fd) != EOF);
ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(fd1.fd.size == FILE_SIZE / 2);
ASSERT(fd1.fd.seek_pos == 0);
ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("15: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
int j;
for (j = 1; j < 1013; j++)
{
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
buf[i] = j+i;
ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
memset(buf, 0, sizeof(buf));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
ASSERT(fd1.fd.seek_pos == sizeof(buf));
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(buf[i] == ((j+i) & 0xff));
ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
}
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
ASSERT(fd1.fd.size == sizeof(buf));
memset(buf, 0, sizeof(buf));
ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(buf[i] == ((j-1+i) & 0xff));
ASSERT(kfile_close(&fd1.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("16: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(kfile_putc(i, &fd2.fd) != EOF);
ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0);
memset(buf, 0, sizeof(buf));
ASSERT(kfile_read(&fd2.fd, buf, sizeof(buf)) == sizeof(buf));
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(buf[i] == (i & 0xff));
ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0);
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(kfile_putc(i, &fd1.fd) != EOF);
memset(buf, 0, sizeof(buf));
ASSERT(kfile_read(&fd2.fd, buf, sizeof(buf)) == sizeof(buf));
- for (int i = 0; i < sizeof(buf); i++)
+ for (unsigned i = 0; i < sizeof(buf); i++)
ASSERT(buf[i] == (i & 0xff));
ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
ASSERT(kfile_close(&fd2.fd) == 0);
- ASSERT(battfs_close(disk));
+ ASSERT(kfile_error(&fd2.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("17: passed\n");
}
+static void readEOF(BattFsSuper *disk)
+{
+ BattFs fd1;
+ uint8_t buf[16];
+
+ TRACEMSG("18: reading over EOF test\n");
+
+ FILE *fp = fopen(test_filename, "w+");
+
+ unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+ inode_t INODE = 0;
+ inode_t INODE2 = 4;
+ unsigned int MODE = 0;
+
+ disk->erase(disk, 0);
+ battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1);
+ disk->erase(disk, 4);
+ battfs_writeTestBlock(disk, 5, INODE2, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(disk, 6, INODE2, 1, PAGE_FILL, 1);
+ battfs_writeTestBlock(disk, 7, INODE2, 0, PAGE_FILL, 1);
+
+ fclose(fp);
+
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+ ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
+ ASSERT(fd1.fd.seek_pos == fd1.fd.size + 10);
+ ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == 0);
+
+ ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ TRACEMSG("18: passed\n");
+}
+
+static void writeEOF(BattFsSuper *disk)
+{
+ TRACEMSG("19: writing over EOF test\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+
+ for (int i = 0; i < FILE_SIZE / 5; i++)
+ fputc(0xff, fpt);
+ fclose(fpt);
+
+ BattFs fd1;
+ inode_t INODE = 0;
+ unsigned int MODE = BATTFS_CREATE;
+ uint8_t buf[FILE_SIZE / 13];
+
+ for (int i = 0; i < 2; i++)
+ buf[i] = i;
+
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
+ disk_size_t prev_free = disk->free_bytes;
+ ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+ ASSERT(fd1.fd.size == 0);
+
+ ASSERT(kfile_seek(&fd1.fd, 2, KSM_SEEK_END) == 2);
+ ASSERT(kfile_write(&fd1.fd, buf, 2));
+ ASSERT(fd1.fd.seek_pos == 4);
+ ASSERT(fd1.fd.size == 4);
+ ASSERT(disk->free_bytes == prev_free - 4);
+ ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
+ memset(buf, 0, 2);
+ ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+ for (int i = 0; i < 2; i++)
+ ASSERT(buf[i] == 0);
+
+ memset(buf, 0, 2);
+ ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+ for (int i = 0; i < 2; i++)
+ ASSERT(buf[i] == (i & 0xff));
+
+ ASSERT(kfile_seek(&fd1.fd, sizeof(buf), KSM_SEEK_END) == sizeof(buf) + 4);
+ for (unsigned i = 0; i < sizeof(buf); i++)
+ buf[i] = i;
+ ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)));
+ ASSERT(fd1.fd.seek_pos == sizeof(buf) * 2 + 4);
+ ASSERT(fd1.fd.size == sizeof(buf) * 2 + 4);
+ ASSERT(disk->free_bytes == prev_free - sizeof(buf) * 2 - 4);
+
+ ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
+
+ memset(buf, 0, 2);
+ ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+ ASSERT(fd1.fd.seek_pos == 2);
+ for (int i = 0; i < 2; i++)
+ ASSERT(buf[i] == 0);
+
+ memset(buf, 0, 2);
+ ASSERT(kfile_read(&fd1.fd, buf, 2) == 2);
+ ASSERT(fd1.fd.seek_pos == 4);
+ for (int i = 0; i < 2; i++)
+ ASSERT(buf[i] == (i & 0xff));
+
+ memset(buf, 0, 4);
+ ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+ ASSERT(fd1.fd.seek_pos == sizeof(buf) + 4);
+ for (unsigned i = 0; i < sizeof(buf); i++)
+ ASSERT(buf[i] == 0);
+
+ memset(buf, 0, sizeof(buf));
+ ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+ for (unsigned i = 0; i < sizeof(buf); i++)
+ ASSERT(buf[i] == (i & 0xff));
+
+ ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ TRACEMSG("19: passed\n");
+
+}
+
+static void endOfSpace(BattFsSuper *disk)
+{
+ TRACEMSG("20: what happens when disk space is over?\n");
+ BattFs fd1;
+ uint8_t buf[(PAGE_SIZE - BATTFS_HEADER_LEN) * 5];
+
+ FILE *fp = fopen(test_filename, "w+");
+
+ unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+ inode_t INODE = 0;
+ unsigned int MODE = BATTFS_CREATE;
+
+ disk->erase(disk, 0);
+ disk->erase(disk, 1);
+ disk->erase(disk, 2);
+ disk->erase(disk, 3);
+ fclose(fp);
+
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+ ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == PAGE_FILL * 4);
+ ASSERT(fd1.fd.size == (kfile_off_t)(PAGE_FILL * 4));
+ ASSERT(fd1.fd.seek_pos == (kfile_off_t)(PAGE_FILL * 4));
+ ASSERT(disk->free_bytes == 0);
+
+ ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == BATTFS_DISK_GETNEWPAGE_ERR);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ TRACEMSG("20: passed\n");
+}
+
+
+static void multipleFilesRW(BattFsSuper *disk)
+{
+ TRACEMSG("21: multiple files read/write test\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+
+ for (int i = 0; i < FILE_SIZE; i++)
+ fputc(0xff, fpt);
+ fclose(fpt);
+
+ #define N_FILES 10
+ BattFs fd[N_FILES];
+ unsigned int MODE = BATTFS_CREATE;
+ uint32_t buf[FILE_SIZE / (4 * N_FILES * sizeof(uint32_t))];
+
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
+ for (inode_t i = 0; i < N_FILES; i++)
+ ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+ for (int i = N_FILES - 1; i >= 0; i--)
+ {
+ for (uint32_t j = 0; j < countof(buf); j++)
+ buf[j] = j+i;
+
+ ASSERT(kfile_write(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+ ASSERT(fd[i].fd.size == sizeof(buf));
+ ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+ ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+ }
+
+ for (inode_t i = 0; i < N_FILES; i++)
+ {
+ memset(buf, 0, sizeof(buf));
+ ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+
+ for (uint32_t j = 0; j < countof(buf); j++)
+ ASSERT(buf[j] == j+i);
+
+ ASSERT(fd[i].fd.size == sizeof(buf));
+ ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+ ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+ }
+
+ for (inode_t i = 0; i < N_FILES; i++)
+ {
+ ASSERT(kfile_close(&fd[i].fd) == 0);
+ ASSERT(kfile_error(&fd[i].fd) == 0);
+ }
+
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ ASSERT(disk_open(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
+
+ for (inode_t i = 0; i < N_FILES; i++)
+ ASSERT(battfs_fileopen(disk, &fd[i], i, 0));
+
+ for (inode_t i = 0; i < N_FILES; i++)
+ {
+ memset(buf, 0, sizeof(buf));
+ ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
+
+ for (uint32_t j = 0; j < countof(buf); j++)
+ ASSERT(buf[j] == j+i);
+
+ ASSERT(fd[i].fd.size == sizeof(buf));
+ ASSERT(fd[i].fd.seek_pos == sizeof(buf));
+ ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
+ }
+
+ for (inode_t i = 0; i < N_FILES; i++)
+ {
+ ASSERT(kfile_close(&fd[i].fd) == 0);
+ ASSERT(kfile_error(&fd[i].fd) == 0);
+ }
+
+ ASSERT(battfs_umount(disk));
+ TRACEMSG("21: passed\n");
+}
+
+
int battfs_testRun(void)
{
BattFsSuper disk;
- disk.open = disk_open;
- disk.read = disk_page_read;
- disk.load = disk_page_load;
- disk.bufferWrite = disk_buffer_write;
- disk.bufferRead = disk_buffer_read;
- disk.save = disk_page_save;
- disk.erase = disk_page_erase;
- disk.close = disk_close;
-
diskNew(&disk);
disk1File(&disk);
diskHalfFile(&disk);
createFile(&disk);
multipleWrite(&disk);
increaseFile(&disk);
+ readEOF(&disk);
+ writeEOF(&disk);
+ endOfSpace(&disk);
+ multipleFilesRW(&disk);
kprintf("All tests passed!\n");
projects / bertos.git / blobdiff