static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
{
- ASSERT(battfs_init(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);
}
}
ASSERT(battfs_fsck(disk));
- battfs_close(disk);
+ battfs_umount(disk);
}
static void diskNew(BattFsSuper *disk)
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
ASSERT(battfs_fileExists(disk, INODE));
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(LIST_EMPTY(&disk->file_opened_list));
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("10: passed\n");
}
fclose(fp);
- ASSERT(battfs_init(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(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("11: passed\n");
}
fclose(fp);
- ASSERT(battfs_init(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(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("12: passed\n");
}
for (size_t i = 0; i < sizeof(buf); i++)
buf[i] = i;
- ASSERT(battfs_init(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(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("13: passed\n");
}
fclose(fp);
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
uint8_t val = 0;
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("14: passed\n");
}
inode_t INODE = 0;
unsigned int MODE = BATTFS_CREATE;
- ASSERT(battfs_init(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.size == FILE_SIZE / 2);
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(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_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("15: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
+ ASSERT(battfs_fsck(disk));
ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
int j;
}
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
- ASSERT(battfs_init(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));
ASSERT(buf[i] == ((j-1+i) & 0xff));
ASSERT(kfile_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("16: passed\n");
unsigned int MODE = BATTFS_CREATE;
uint8_t buf[1000];
- ASSERT(battfs_init(disk));
+ ASSERT(battfs_mount(disk));
+ 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_close(&fd1.fd) == 0);
ASSERT(kfile_close(&fd2.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("17: passed\n");
}
fclose(fp);
- ASSERT(battfs_init(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_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(disk));
+ ASSERT(battfs_umount(disk));
TRACEMSG("18: passed\n");
}
for (int i = 0; i < 2; i++)
buf[i] = i;
- ASSERT(battfs_init(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_close(&fd1.fd) == 0);
ASSERT(battfs_fsck(disk));
- ASSERT(battfs_close(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];
+
+ 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(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(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(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(battfs_fsck(disk));
+ ASSERT(battfs_umount(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(battfs_umount(disk));
+ TRACEMSG("21: 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;
increaseFile(&disk);
readEOF(&disk);
writeEOF(&disk);
+ endOfSpace(&disk);
+ multipleFilesRW(&disk);
kprintf("All tests passed!\n");