X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs_test.c;h=cbbadeb9ee9da896c0c12ce1899c4224c6ef95e4;hb=e168c669eb9a7b0e47a12046649761c1d953a970;hp=1bcb037eaf0254c170f1b523f84648590ff22047;hpb=62b72d098736c829bbfd8ff766906fca86f0009c;p=bertos.git diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c index 1bcb037e..cbbadeb9 100644 --- a/bertos/fs/battfs_test.c +++ b/bertos/fs/battfs_test.c @@ -69,37 +69,46 @@ static bool disk_open(struct BattFsSuper *d) 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); + //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); + //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); + //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); + //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\n", page); + //TRACEMSG("page:%d", page); fseek(fp, page * d->page_size, SEEK_SET); for (int i = 0; i < d->page_size; i++) @@ -146,10 +155,10 @@ static void testCheck(BattFsSuper *disk, pgcnt_t *reference) battfs_close(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+"); @@ -160,13 +169,13 @@ static void test1(BattFsSuper *disk) ref[i] = i; 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"); fp = fopen(test_filename, "w+"); @@ -179,14 +188,14 @@ static void test2(BattFsSuper *disk) fclose(fp); 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+"); @@ -208,70 +217,14 @@ static void test3(BattFsSuper *disk) testCheck(disk, ref); - kprintf("Test3: 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"); + TRACEMSG("3: 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"); fp = fopen(test_filename, "w+"); @@ -289,13 +242,13 @@ static void test6(BattFsSuper *disk) ref[3] = 3; 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"); fp = fopen(test_filename, "w+"); @@ -312,13 +265,13 @@ static void test7(BattFsSuper *disk) ref[3] = 3; 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+"); @@ -337,13 +290,13 @@ static void test8(BattFsSuper *disk) ref[3] = 3; 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+"); @@ -370,21 +323,21 @@ static void test9(BattFsSuper *disk) ref[7] = 7; 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"); 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 @@ -436,21 +389,21 @@ static void test10(BattFsSuper *disk) ASSERT(LIST_EMPTY(&disk->file_opened_list)); ASSERT(battfs_close(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"); 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); @@ -474,20 +427,20 @@ static void test11(BattFsSuper *disk) ASSERT(kfile_close(&fd1.fd) == 0); ASSERT(battfs_close(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+"); const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN; - unsigned int INODE = 0; - unsigned int MODE = 0; + inode_t INODE = 0; + inode_t MODE = 0; uint8_t buf[PAGE_FILL + BATTFS_HEADER_LEN / 2]; disk->erase(disk, 0); @@ -533,10 +486,268 @@ static void test12(BattFsSuper *disk) ASSERT(kfile_close(&fd1.fd) == 0); ASSERT(battfs_close(disk)); - kprintf("Test12: passed\n"); + TRACEMSG("12: passed\n"); } +static void writeFile(BattFsSuper *disk) +{ + BattFs fd1; + uint8_t buf[PAGE_SIZE - BATTFS_HEADER_LEN]; + + TRACEMSG("13: write file test\n"); + + 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); + + for (size_t i = 0; i < sizeof(buf); i++) + buf[i] = i; + + ASSERT(battfs_init(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(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0); + ASSERT(fd1.fd.seek_pos == 0); + + memset(buf, 0, sizeof(buf)); + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == i); + + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(battfs_close(disk)); + + TRACEMSG("13: passed\n"); +} + +static void writeAcross(BattFsSuper *disk) +{ + BattFs fd1; + + TRACEMSG("14: write file test across page boundary and seek test\n"); + + fp = fopen(test_filename, "w+"); + + const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN; + inode_t INODE = 0; + inode_t 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)); + ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE)); + + uint8_t val = 0; + for (size_t i = 0; i < sizeof(buf); i++) + buf[i] = val++; + ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf)); + + for (size_t i = 0; i < sizeof(buf); i++) + buf[i] = val++; + ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 2); + + for (size_t i = 0; i < sizeof(buf); i++) + buf[i] = val++; + ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3); + + ASSERT(kfile_seek(&fd1.fd, 0, KSM_SEEK_SET) == 0); + ASSERT(fd1.fd.seek_pos == 0); + val = 0; + + memset(buf, 0, sizeof(buf)); + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == val++); + + memset(buf, 0, sizeof(buf)); + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == val++); + + memset(buf, 0, sizeof(buf)); + ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf)); + for (size_t i = 0; i < sizeof(buf); i++) + ASSERT(buf[i] == val++); + + ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3); + + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(battfs_close(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); + fclose(fpt); + + BattFs fd1; + inode_t INODE = 0; + inode_t MODE = BATTFS_CREATE; + + ASSERT(battfs_init(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(battfs_init(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(battfs_close(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); + fclose(fpt); + + BattFs fd1; + inode_t INODE = 0; + inode_t MODE = BATTFS_CREATE; + uint8_t buf[1000]; + + ASSERT(battfs_init(disk)); + ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE)); + + int j; + for (j = 1; j < 1013; j++) + { + for (int 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 (int 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(battfs_init(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++) + ASSERT(buf[i] == ((j-1+i) & 0xff)); + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(battfs_close(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); + fclose(fpt); + + BattFs fd1,fd2; + inode_t INODE1 = 1, INODE2 = 2; + inode_t MODE = BATTFS_CREATE; + uint8_t buf[1000]; + + ASSERT(battfs_init(disk)); + ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE)); + ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE)); + for (int 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++) + ASSERT(buf[i] == (i & 0xff)); + ASSERT(kfile_seek(&fd2.fd, 0, KSM_SEEK_SET) == 0); + + for (int 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++) + ASSERT(buf[i] == (i & 0xff)); + + ASSERT(kfile_close(&fd1.fd) == 0); + ASSERT(kfile_close(&fd2.fd) == 0); + ASSERT(battfs_close(disk)); + + TRACEMSG("17: passed\n"); +} + int battfs_testRun(void) { BattFsSuper disk; @@ -545,21 +756,27 @@ int battfs_testRun(void) 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); + + 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); + kprintf("All tests passed!\n"); return 0;