*/
#include <fs/battfs.h>
+#include <io/kblock_file.h>
#include <cfg/debug.h>
#include <cfg/test.h>
#define FILE_SIZE 32768
#define PAGE_SIZE 128
-#define PAGE_COUNT FILE_SIZE / PAGE_SIZE
+
+#define DATA_SIZE (PAGE_SIZE - BATTFS_HEADER_LEN)
+#define PAGE_COUNT (FILE_SIZE / PAGE_SIZE)
#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);
- fseek(fp, page * d->page_size + addr, SEEK_SET);
- return fread(buf, 1, size, fp);
-}
-
-static size_t disk_buffer_write(struct BattFsSuper *d, pgaddr_t addr, const void *buf, size_t size)
-{
- TRACEMSG("addr:%d, size:%d", addr, size);
- ASSERT(addr + size <= d->page_size);
- memcpy(&page_buffer[addr], buf, size);
-
- return size;
-}
-
-static size_t disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf, size_t size)
-{
- TRACEMSG("addr:%d, size:%d", addr, size);
- ASSERT(addr + size <= d->page_size);
- memcpy(buf, &page_buffer[addr], size);
-
- return size;
-}
-
-static bool disk_page_load(struct BattFsSuper *d, pgcnt_t page)
-{
- 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)
-{
- 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)
-{
- TRACEMSG("page:%d", page);
- fseek(fp, page * d->page_size, SEEK_SET);
-
- for (int i = 0; i < d->page_size; i++)
- if (fputc(0xff, fp) == EOF)
- return false;
- return true;
-}
-
-static bool disk_close(struct BattFsSuper *d)
-{
- //TRACE;
- free(d->page_array);
- return (fclose(fp) != EOF);
-}
+static pgcnt_t page_array[PAGE_COUNT];
static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
{
- ASSERT(battfs_init(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));
+ ASSERT(battfs_umount(disk));
}
-static void test1(BattFsSuper *disk)
+static void diskNew(BattFsSuper *disk)
{
pgcnt_t ref[PAGE_COUNT];
- kprintf("Test1: disk new\n");
+
+ TRACEMSG("1: disk new\n");
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
- fclose(fpt);
+
for (int i = 0; i < PAGE_COUNT; i++)
ref[i] = i;
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
+
testCheck(disk, ref);
- kprintf("Test1: passed\n");
+ TRACEMSG("1: passed\n");
}
-static void test2(BattFsSuper *disk)
+static void disk1File(BattFsSuper *disk)
{
pgcnt_t ref[PAGE_COUNT];
- kprintf("Test2: disk full with 1 contiguos file\n");
+ TRACEMSG("2: disk full with 1 contiguos file\n");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < FILE_SIZE; i++)
+ fputc(0xff, fp);
- fp = fopen(test_filename, "w+");
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, PAGE_COUNT);
for (int i = 0; i < PAGE_COUNT; i++)
{
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+ battfs_writeTestBlock(&f.b, i, 0, 0, DATA_SIZE, i);
ref[i] = i;
}
- fclose(fp);
+
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
- kprintf("Test2: passed\n");
+ TRACEMSG("2: passed\n");
}
-static void test3(BattFsSuper *disk)
+static void diskHalfFile(BattFsSuper *disk)
{
pgcnt_t ref[PAGE_COUNT];
- kprintf("Test3: disk half full with 1 contiguos file, rest unformatted\n");
+ 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 < FILE_SIZE; i++)
+ fputc(0xff, fp);
+
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, PAGE_COUNT);
for (int i = 0; i < PAGE_COUNT / 2; i++)
{
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
+ battfs_writeTestBlock(&f.b, i, 0, 0, DATA_SIZE, i);
ref[i] = i;
}
fseek(fp, FILE_SIZE / 2, SEEK_SET);
for (int i = FILE_SIZE / 2; i < FILE_SIZE; i++)
fputc(0xff, fp);
- fclose(fp);
for (int i = PAGE_COUNT / 2; i < PAGE_COUNT; i++)
{
ref[i] = i;
}
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
- kprintf("Test3: passed\n");
+ TRACEMSG("3: passed\n");
}
-#if 0
-static void test4(BattFsSuper *disk)
-{
- pgcnt_t ref[PAGE_COUNT];
- kprintf("Test4: disk half full with 1 contiguos file, rest marked free\n");
-
-
- fp = fopen(test_filename, "w+");
-
- for (int i = 0; i < PAGE_COUNT / 2; i++)
- {
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
- ref[i] = i;
- }
- for (int i = PAGE_COUNT / 2; i < PAGE_COUNT; i++)
- {
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
- ref[i] = i;
- }
- fclose(fp);
-
- testCheck(disk, ref);
- kprintf("Test4: passed\n");
-}
-
-static void test5(BattFsSuper *disk)
-{
- pgcnt_t ref[PAGE_COUNT];
- kprintf("Test5: disk 1/3 full with 1 contiguos file, 1/3 marked free, rest unformatted\n");
-
-
- fp = fopen(test_filename, "w+");
-
- for (int i = 0; i < FILE_SIZE; i++)
- fputc(0xff, fp);
-
- for (int i = 0; i < PAGE_COUNT / 3; i++)
- {
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
- ref[i] = i;
- }
- for (int i = PAGE_COUNT / 3; i < 2 * (PAGE_COUNT / 3); i++)
- {
- battfs_writeTestBlock(disk, i, 0, 0, 0, i);
- ref[i + PAGE_COUNT / 3 + 1] = i;
- }
- fclose(fp);
-
- for (int i = PAGE_COUNT / 3; i < 2 * (PAGE_COUNT / 3) + 1; i++)
- ref[i] = PAGE_COUNT + PAGE_COUNT / 3 - i - 1;
-
- testCheck(disk, ref);
- kprintf("Test5: passed\n");
-}
-#endif
-
-static void test6(BattFsSuper *disk)
+static void oldSeq1(BattFsSuper *disk)
{
pgcnt_t ref[4];
- kprintf("Test6: 1 file with 1 old seq num, 1 free block\n");
+ TRACEMSG("6: 1 file with 1 old seq num, 1 free block\n");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 4; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 4);
- 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);
- disk->erase(disk, 3);
+ battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
+ battfs_writeTestBlock(&f.b, 1, 0, 0, DATA_SIZE, 1);
+ battfs_writeTestBlock(&f.b, 2, 0, 1, DATA_SIZE, 1);
+ battfs_eraseBlock(&f.b, 3);
-
- fclose(fp);
ref[0] = 0;
ref[1] = 2;
ref[2] = 1;
ref[3] = 3;
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
+
testCheck(disk, ref);
- kprintf("Test6: passed\n");
+ TRACEMSG("6: passed\n");
}
-static void test7(BattFsSuper *disk)
+static void oldSeq2(BattFsSuper *disk)
{
pgcnt_t ref[4];
- kprintf("Test7: 1 file with 1 old seq num, 1 free block\n");
+ TRACEMSG("7: 1 file with 1 old seq num, 1 free block\n");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 4; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 4);
- 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);
- disk->erase(disk, 3);
+ battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
+ battfs_writeTestBlock(&f.b, 1, 0, 1, DATA_SIZE, 1);
+ battfs_writeTestBlock(&f.b, 2, 0, 0, DATA_SIZE, 1);
+ battfs_eraseBlock(&f.b, 3);
- fclose(fp);
ref[0] = 0;
ref[1] = 1;
ref[2] = 2;
ref[3] = 3;
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
- kprintf("Test7: passed\n");
+ TRACEMSG("7: passed\n");
}
-static void test8(BattFsSuper *disk)
+static void oldSeq3(BattFsSuper *disk)
{
pgcnt_t ref[4];
- kprintf("Test8: 1 file with 1 old seq num, 1 free block\n");
+ TRACEMSG("8: 1 file with 1 old seq num, 1 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 4; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 4);
// 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_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, 0, 0, DATA_SIZE, 0);
+ battfs_writeTestBlock(&f.b, 2, 0, 1, DATA_SIZE, 1);
+ battfs_writeTestBlock(&f.b, 3, 0, 0, DATA_SIZE, 1);
-
- fclose(fp);
ref[0] = 1;
ref[1] = 2;
ref[2] = 0;
ref[3] = 3;
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
- kprintf("Test8: passed\n");
+ TRACEMSG("8: passed\n");
}
-static void test9(BattFsSuper *disk)
+static void oldSeq2File(BattFsSuper *disk)
{
pgcnt_t ref[8];
- kprintf("Test9: 2 file with old seq num, 2 free block\n");
+ TRACEMSG("9: 2 file with old seq num, 2 free block\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
// 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);
- 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_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, 0, 0, DATA_SIZE, 0);
+ battfs_writeTestBlock(&f.b, 2, 0, 3, DATA_SIZE, 1);
+ battfs_writeTestBlock(&f.b, 3, 0, 0, DATA_SIZE, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, 4, 0, DATA_SIZE, 0);
+ battfs_writeTestBlock(&f.b, 6, 4, 1, DATA_SIZE, 1);
+ battfs_writeTestBlock(&f.b, 7, 4, 0, DATA_SIZE, 1);
- fclose(fp);
ref[0] = 1;
ref[1] = 2;
ref[2] = 5;
ref[6] = 4;
ref[7] = 7;
+ battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
- kprintf("Test9: passed\n");
+ TRACEMSG("9: passed\n");
}
-static void test10(BattFsSuper *disk)
+static void openFile(BattFsSuper *disk)
{
BattFs fd1;
BattFs fd2;
- kprintf("Test10: open file test, inode 0 and inode 4\n");
+ TRACEMSG("10: open file test, inode 0 and inode 4\n");
+
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
- fp = fopen(test_filename, "w+");
int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
- unsigned int INODE = 0;
- unsigned int INODE2 = 4;
- unsigned int INEXISTENT_INODE = 123;
+ inode_t INODE = 0;
+ inode_t INODE2 = 4;
+ inode_t INEXISTENT_INODE = 123;
unsigned int MODE = 0;
// page, inode, seq, fill, pgoff
- 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(battfs_init(disk));
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE2, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 6, INODE2, 1, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 7, INODE2, 0, PAGE_FILL, 1);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
- kprintf("Test10: passed\n");
+ TRACEMSG("10: passed\n");
}
-static void test11(BattFsSuper *disk)
+static void readFile(BattFsSuper *disk)
{
BattFs fd1;
uint8_t buf[16];
- kprintf("Test11: read file test\n");
+ TRACEMSG("11: read file test\n");
+
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
- fp = fopen(test_filename, "w+");
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
- unsigned int INODE = 0;
- unsigned int INODE2 = 4;
+ 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(battfs_init(disk));
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE2, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 6, INODE2, 1, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 7, INODE2, 0, PAGE_FILL, 1);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
- kprintf("Test11: passed\n");
+ TRACEMSG("11: passed\n");
}
-static void test12(BattFsSuper *disk)
+static void readAcross(BattFsSuper *disk)
{
BattFs fd1;
- kprintf("Test12: read file test across page boundary and seek test\n");
+ TRACEMSG("12: read file test across page boundary and seek test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
- unsigned int INODE = 0;
+ inode_t INODE = 0;
unsigned int MODE = 0;
uint8_t buf[PAGE_FILL + BATTFS_HEADER_LEN / 2];
- 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, INODE, 0, PAGE_FILL, 2);
- battfs_writeTestBlock(disk, 6, INODE, 1, PAGE_FILL, 3);
- battfs_writeTestBlock(disk, 7, INODE, 0, PAGE_FILL, 3);
-
- fclose(fp);
-
- ASSERT(battfs_init(disk));
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE, 0, PAGE_FILL, 2);
+ battfs_writeTestBlock(&f.b, 6, INODE, 1, PAGE_FILL, 3);
+ battfs_writeTestBlock(&f.b, 7, INODE, 0, PAGE_FILL, 3);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
- kprintf("Test12: passed\n");
+ TRACEMSG("12: passed\n");
}
-static void test13(BattFsSuper *disk)
+static void writeFile(BattFsSuper *disk)
{
BattFs fd1;
uint8_t buf[PAGE_SIZE - BATTFS_HEADER_LEN];
- kprintf("Test13: write file test\n");
+ TRACEMSG("13: write file test\n");
+
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
- fp = fopen(test_filename, "w+");
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
- unsigned int INODE = 0;
- unsigned int INODE2 = 4;
+ 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);
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE2, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 6, INODE2, 1, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 7, INODE2, 0, PAGE_FILL, 1);
for (size_t i = 0; i < sizeof(buf); i++)
buf[i] = i;
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
- kprintf("Test13: passed\n");
+ TRACEMSG("13: passed\n");
}
-static void test14(BattFsSuper *disk)
+static void writeAcross(BattFsSuper *disk)
{
BattFs fd1;
- kprintf("Test14: write file test across page boundary and seek test\n");
+ TRACEMSG("14: write file test across page boundary and seek test\n");
- fp = fopen(test_filename, "w+");
+ FILE *fp = fopen(test_filename, "w+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
- unsigned int INODE = 0;
+ inode_t INODE = 0;
unsigned int MODE = 0;
uint8_t buf[PAGE_FILL + BATTFS_HEADER_LEN / 2];
- 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, INODE, 0, PAGE_FILL, 2);
- battfs_writeTestBlock(disk, 6, INODE, 1, PAGE_FILL, 3);
- battfs_writeTestBlock(disk, 7, INODE, 0, PAGE_FILL, 3);
-
- fclose(fp);
-
- ASSERT(battfs_init(disk));
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE, 0, PAGE_FILL, 2);
+ battfs_writeTestBlock(&f.b, 6, INODE, 1, PAGE_FILL, 3);
+ battfs_writeTestBlock(&f.b, 7, INODE, 0, PAGE_FILL, 3);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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");
+}
+
+static void createFile(BattFsSuper *disk)
+{
+ TRACEMSG("15: file creation on new disk\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+ for (int i = 0; i < FILE_SIZE; i++)
+ fputc(0xff, fpt);
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ BattFs fd1;
+ inode_t INODE = 0;
+ unsigned int MODE = BATTFS_CREATE;
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ fpt = fopen(test_filename, "r+");
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
+ ASSERT(fd1.fd.size == FILE_SIZE / 2);
+ ASSERT(fd1.fd.seek_pos == 0);
+
+ uint8_t buf[FILE_SIZE / 2];
+ memset(buf, 0, sizeof(buf));
+ ASSERT(kfile_read(&fd1.fd, buf, FILE_SIZE / 2) == FILE_SIZE / 2);
+
+ for (int i = 0; i < FILE_SIZE / 2; i++)
+ ASSERT(buf[i] == (i & 0xff));
+
+ ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
+ ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+
+ TRACEMSG("15: passed\n");
+}
+
+static void multipleWrite(BattFsSuper *disk)
+{
+ TRACEMSG("16: multiple write on file\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+ for (int i = 0; i < FILE_SIZE; i++)
+ fputc(0xff, fpt);
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+
+ BattFs fd1;
+ inode_t INODE = 0;
+ unsigned int MODE = BATTFS_CREATE;
+ uint8_t buf[1000];
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+
+ int j;
+ for (j = 1; j < 1013; j++)
+ {
+ for (unsigned i = 0; i < sizeof(buf); i++)
+ buf[i] = j+i;
+
+ ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+ ASSERT(fd1.fd.seek_pos == sizeof(buf));
+ ASSERT(fd1.fd.size == sizeof(buf));
+ ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0);
+ memset(buf, 0, sizeof(buf));
+ ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
+ ASSERT(fd1.fd.seek_pos == sizeof(buf));
+ 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(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+ fpt = fopen(test_filename, "r+");
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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 (unsigned i = 0; i < sizeof(buf); i++)
+ ASSERT(buf[i] == ((j-1+i) & 0xff));
+ ASSERT(kfile_close(&fd1.fd) == 0);
+ ASSERT(kfile_error(&fd1.fd) == 0);
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+
+ TRACEMSG("16: passed\n");
+}
+
+static void increaseFile(BattFsSuper *disk)
+{
+ TRACEMSG("17: increasing dimension of a file with multiple open files.\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+ for (int i = 0; i < FILE_SIZE / 10; i++)
+ fputc(0xff, fpt);
+
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT / 10);
+
+
+ BattFs fd1,fd2;
+ inode_t INODE1 = 1, INODE2 = 2;
+ unsigned int MODE = BATTFS_CREATE;
+ uint8_t buf[1000];
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
+ ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
+ 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 (unsigned i = 0; i < sizeof(buf); i++)
+ ASSERT(buf[i] == (i & 0xff));
+ ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0);
+
+ 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 (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(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+");
+ for (int i = 0; i < PAGE_SIZE * 8; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 8);
+
+
+ unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+ inode_t INODE = 0;
+ inode_t INODE2 = 4;
+ unsigned int MODE = 0;
+
+ battfs_eraseBlock(&f.b, 0);
+ battfs_writeTestBlock(&f.b, 1, INODE, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 2, INODE, 3, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 3, INODE, 0, PAGE_FILL, 1);
+ battfs_eraseBlock(&f.b, 4);
+ battfs_writeTestBlock(&f.b, 5, INODE2, 0, PAGE_FILL, 0);
+ battfs_writeTestBlock(&f.b, 6, INODE2, 1, PAGE_FILL, 1);
+ battfs_writeTestBlock(&f.b, 7, INODE2, 0, PAGE_FILL, 1);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
- kprintf("Test14: passed\n");
+ 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);
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT / 5);
+
+ 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(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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+");
+ for (int i = 0; i < PAGE_SIZE * 4; i++)
+ fputc(0xff, fp);
+ KBlockFile f;
+ kblockfile_init(&f, fp, page_buffer, PAGE_SIZE, 4);
+
+ unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+ inode_t INODE = 0;
+ unsigned int MODE = BATTFS_CREATE;
+
+ battfs_eraseBlock(&f.b, 0);
+ battfs_eraseBlock(&f.b, 1);
+ battfs_eraseBlock(&f.b, 2);
+ battfs_eraseBlock(&f.b, 3);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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_SPACEOVER_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);
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ #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(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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));
+
+ fpt = fopen(test_filename, "r+");
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ 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");
+}
+
+
+static void openAllFiles(BattFsSuper *disk)
+{
+ TRACEMSG("22: try to open a lot of files\n");
+
+ FILE *fpt = fopen(test_filename, "w+");
+ for (int i = 0; i < FILE_SIZE; i++)
+ fputc(0xff, fpt);
+ KBlockFile f;
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ BattFs fd[BATTFS_MAX_FILES];
+ unsigned int MODE = BATTFS_CREATE;
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ ASSERT(battfs_fsck(disk));
+ for (unsigned i = 0; i < countof(fd); i++)
+ ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+ ASSERT(battfs_fsck(disk));
+
+ for (unsigned i = 0; i < countof(fd); i++)
+ {
+ ASSERT(kfile_close(&fd[i].fd) == 0);
+ ASSERT(kfile_error(&fd[i].fd) == 0);
+ }
+
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+
+
+ fpt = fopen(test_filename, "r+");
+ kblockfile_init(&f, fpt, page_buffer, PAGE_SIZE, PAGE_COUNT);
+
+ ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
+ ASSERT(battfs_fsck(disk));
+
+
+ for (unsigned i = 0; i < countof(fd); i++)
+ ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
+
+ ASSERT(battfs_fsck(disk));
+
+ for (unsigned i = 0; i < countof(fd); i++)
+ {
+ ASSERT(kfile_close(&fd[i].fd) == 0);
+ ASSERT(kfile_error(&fd[i].fd) == 0);
+ }
+
+ ASSERT(battfs_fsck(disk));
+ ASSERT(battfs_umount(disk));
+ TRACEMSG("22: 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;
- test1(&disk);
- test2(&disk);
- test3(&disk);
- //test4(&disk);
- //test5(&disk);
- test6(&disk);
- test7(&disk);
- test8(&disk);
- test9(&disk);
- test10(&disk);
- test11(&disk);
- test12(&disk);
- test13(&disk);
- test14(&disk);
+ diskNew(&disk);
+ disk1File(&disk);
+ diskHalfFile(&disk);
+ oldSeq1(&disk);
+ oldSeq2(&disk);
+ oldSeq3(&disk);
+ oldSeq2File(&disk);
+ openFile(&disk);
+ readFile(&disk);
+ readAcross(&disk);
+ writeFile(&disk);
+ writeAcross(&disk);
+ createFile(&disk);
+ multipleWrite(&disk);
+ increaseFile(&disk);
+ readEOF(&disk);
+ writeEOF(&disk);
+ endOfSpace(&disk);
+ multipleFilesRW(&disk);
+ openAllFiles(&disk);
+
kprintf("All tests passed!\n");
return 0;
return 0;
}
-TEST_MAIN(battfs)
-
-#include <fs/battfs.c>
-#include <kern/kfile.c>
-#include <drv/kdebug.c>
-#include <mware/formatwr.c>
-#include <mware/hex.c>
+TEST_MAIN(battfs);
#endif // _TEST
projects / bertos.git / blobdiff