X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs_test.c;h=642e6d6423b179c60ee777f76a53c27cbc50b279;hb=efaa76e41313ea66ca001bd09948d90c52e58c5c;hp=e3996cab78a21894c35149c6ff486937229ce41f;hpb=500fbef0b281c79719c73ba1a818db54057f74b7;p=bertos.git

diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c
index e3996cab..642e6d64 100644
--- a/bertos/fs/battfs_test.c
+++ b/bertos/fs/battfs_test.c
@@ -50,26 +50,14 @@
 
 #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);
 }
@@ -94,6 +82,7 @@ static size_t disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf,
 
 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;
@@ -101,6 +90,7 @@ static bool disk_page_load(struct BattFsSuper *d, pgcnt_t page)
 
 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;
@@ -108,6 +98,7 @@ static bool disk_page_save(struct BattFsSuper *d, pgcnt_t page)
 
 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);
 
@@ -119,13 +110,36 @@ static bool disk_page_erase(struct BattFsSuper *d, pgcnt_t page)
 
 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(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 
@@ -153,8 +167,9 @@ static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 			exit(2);
 		}
 	}
+
 	ASSERT(battfs_fsck(disk));
-	battfs_umount(disk);
+	ASSERT(battfs_umount(disk));
 }
 
 static void diskNew(BattFsSuper *disk)
@@ -180,7 +195,7 @@ static void disk1File(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++)
 	{
@@ -200,7 +215,7 @@ static void diskHalfFile(BattFsSuper *disk)
 	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++)
 	{
@@ -229,7 +244,7 @@ static void oldSeq1(BattFsSuper *disk)
 	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, disk->data_size, 0);
 	battfs_writeTestBlock(disk, 1, 0, 0, disk->data_size, 1);
@@ -253,7 +268,7 @@ static void oldSeq2(BattFsSuper *disk)
 	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, disk->data_size, 0);
 	battfs_writeTestBlock(disk, 1, 0, 1, disk->data_size, 1);
@@ -276,7 +291,7 @@ static void oldSeq3(BattFsSuper *disk)
 	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);
@@ -301,7 +316,7 @@ static void oldSeq2File(BattFsSuper *disk)
 	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);
@@ -334,7 +349,7 @@ static void openFile(BattFsSuper *disk)
 	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;
@@ -354,6 +369,7 @@ static void openFile(BattFsSuper *disk)
 
 	fclose(fp);
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
@@ -388,7 +404,9 @@ static void openFile(BattFsSuper *disk)
 	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_fsck(disk));
 	ASSERT(battfs_umount(disk));
@@ -403,7 +421,7 @@ static void readFile(BattFsSuper *disk)
 
 	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;
@@ -421,6 +439,7 @@ static void readFile(BattFsSuper *disk)
 
 	fclose(fp);
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -430,6 +449,7 @@ static void readFile(BattFsSuper *disk)
 		ASSERT(buf[i] == 0xff);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_umount(disk));
 
@@ -442,7 +462,7 @@ static void readAcross(BattFsSuper *disk)
 
 	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;
@@ -460,6 +480,7 @@ static void readAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -491,6 +512,7 @@ static void readAcross(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos = (kfile_off_t)fd1.fd.size);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_umount(disk));
 
@@ -505,7 +527,7 @@ static void writeFile(BattFsSuper *disk)
 
 	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;
@@ -526,6 +548,7 @@ static void writeFile(BattFsSuper *disk)
 	for (size_t i = 0; i < sizeof(buf); i++)
 		buf[i] = i;
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -540,6 +563,7 @@ static void writeFile(BattFsSuper *disk)
 		ASSERT(buf[i] == i);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_umount(disk));
 
@@ -552,7 +576,7 @@ static void writeAcross(BattFsSuper *disk)
 
 	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;
@@ -570,6 +594,7 @@ static void writeAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -612,6 +637,7 @@ static void writeAcross(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos == (kfile_off_t)sizeof(buf) * 3);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
+	ASSERT(kfile_error(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_umount(disk));
 
@@ -632,6 +658,7 @@ static void createFile(BattFsSuper *disk)
 	inode_t INODE = 0;
 	unsigned int MODE = BATTFS_CREATE;
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -641,9 +668,11 @@ static void createFile(BattFsSuper *disk)
 	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));
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
@@ -659,6 +688,7 @@ static void createFile(BattFsSuper *disk)
 
 	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));
 
@@ -681,6 +711,7 @@ static void multipleWrite(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -704,9 +735,11 @@ static void multipleWrite(BattFsSuper *disk)
 		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));
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
@@ -717,6 +750,7 @@ static void multipleWrite(BattFsSuper *disk)
 	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));
 
@@ -739,6 +773,7 @@ static void increaseFile(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
@@ -763,7 +798,9 @@ static void increaseFile(BattFsSuper *disk)
 		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));
 
@@ -777,7 +814,7 @@ static void readEOF(BattFsSuper *disk)
 
 	TRACEMSG("18: reading over EOF 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;
@@ -795,6 +832,7 @@ static void readEOF(BattFsSuper *disk)
 
 	fclose(fp);
 
+	ASSERT(disk_open(disk));
 	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -803,6 +841,7 @@ static void readEOF(BattFsSuper *disk)
 	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));
 
@@ -827,6 +866,7 @@ static void writeEOF(BattFsSuper *disk)
 	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;
@@ -883,6 +923,7 @@ static void writeEOF(BattFsSuper *disk)
 		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));
 
@@ -896,7 +937,7 @@ static void endOfSpace(BattFsSuper *disk)
 	BattFs fd1;
 	uint8_t buf[(PAGE_SIZE - BATTFS_HEADER_LEN) * 5];
 
-	fp = fopen(test_filename, "w+");
+	FILE *fp = fopen(test_filename, "w+");
 
 	unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
 	inode_t INODE = 0;
@@ -908,6 +949,7 @@ static void endOfSpace(BattFsSuper *disk)
 	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));
@@ -917,6 +959,7 @@ static void endOfSpace(BattFsSuper *disk)
 	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));
 
@@ -939,6 +982,7 @@ static void multipleFilesRW(BattFsSuper *disk)
 	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++)
@@ -969,11 +1013,15 @@ static void multipleFilesRW(BattFsSuper *disk)
 	}
 
 	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));
 
@@ -994,27 +1042,72 @@ static void multipleFilesRW(BattFsSuper *disk)
 	}
 
 	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);
+	fclose(fpt);
+
+	BattFs fd[BATTFS_MAX_FILES];
+	unsigned int MODE = BATTFS_CREATE;
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	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));
+
+	ASSERT(disk_open(disk));
+	ASSERT(battfs_mount(disk));
+	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.page_size = PAGE_SIZE;
-	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);
@@ -1034,6 +1127,7 @@ int battfs_testRun(void)
 	writeEOF(&disk);
 	endOfSpace(&disk);
 	multipleFilesRW(&disk);
+	openAllFiles(&disk);
 
 	kprintf("All tests passed!\n");
 
@@ -1050,12 +1144,6 @@ int battfs_testTearDown(void)
 	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