admin/iloveos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guangzheliu/anotherfixforl1' into layer2dev

Browse Source
This commit is contained in:
Ziao 2023-11-28 09:56:43 -08:00
commit e56d304d2f
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fs/fs.cpp
View File

@ -4,7 +4,7 @@ Fs::Fs(RawDisk *disk) : disk(disk) {
superblock = SuperBlock_Data(); superblock = SuperBlock_Data();
inode_manager = new INode_Manager_Freelist(this, 1, 1 + NUM_INODE_BLOCKS); inode_manager = new INode_Manager_Freelist(this, 1, 1 + NUM_INODE_BLOCKS);
datablock_manager = datablock_manager =
new DataBlock_Manager_Bitmap(this, 1 + NUM_INODE_BLOCKS, NUM_BLOCKS); new DataBlock_Manager_Bitmap(this, 1 + NUM_INODE_BLOCKS, disk->diskSize/IO_BLOCK_SIZE);
}; };
Fs::~Fs() { Fs::~Fs() {

27
test/layer1_API.cpp
View File

@ -7,7 +7,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// const char* d = (argc < 2) ? "/dev/vdc" : argv[1]; // const char* d = (argc < 2) ? "/dev/vdc" : argv[1];
RawDisk *H = new FakeRawDisk(2048); RawDisk *H = new FakeRawDisk(21504);
Fs *fs = new Fs(H); Fs *fs = new Fs(H);
printf("test inode\n"); printf("test inode\n");
@ -65,12 +65,13 @@ int main(int argc, char *argv[]) {
1); // the first 8 bytes of 4k I/O block will store 1); // the first 8 bytes of 4k I/O block will store
// the next address(after 2048*4k I/O block) // the next address(after 2048*4k I/O block)
// test the end of the datablock // test the end of the datablock
H->read_block(NUM_BLOCKS - DATABLOCKS_PER_BITMAP_BLOCK - 1, buffer);
H->read_block(fs->disk->diskSize/IO_BLOCK_SIZE - DATABLOCKS_PER_BITMAP_BLOCK - 1, buffer);
t = 0; t = 0;
for (int j = 0; j < 8; j++) for (int j = 0; j < 8; j++)
t |= ((u_int64_t)(unsigned char)buffer[j]) << (8 * j); t |= ((u_int64_t)(unsigned char)buffer[j]) << (8 * j);
assert(t == NUM_BLOCKS - DATABLOCKS_PER_BITMAP_BLOCK - 1); assert(t == fs->disk->diskSize/IO_BLOCK_SIZE - DATABLOCKS_PER_BITMAP_BLOCK - 1);
/***************************test inode /***************************test inode
* de/allocation**********************************/ * de/allocation**********************************/
@ -111,30 +112,30 @@ int main(int argc, char *argv[]) {
u_int64_t rec_datablock_free[10][3] = {0}; // array version u_int64_t rec_datablock_free[10][3] = {0}; // array version
u_int64_t temp_block_num = 0; u_int64_t temp_block_num = 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
// printf("%dth data block starting addres: ", i); printf("%dth data block starting addres: ", i);
for (int j = 0; j < 6; j++) { for (int j = 0; j < 6; j++) {
fs->allocate_datablock(&inode_list[i], &temp_block_num); fs->allocate_datablock(&inode_list[i], &temp_block_num);
// printf("%d," ,inode_inside[i].datablock_allocate(*H)); printf("%llu," ,temp_block_num);
} }
// printf("\n"); printf("\n");
} }
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
// printf("%dth data block free addres: ", i); printf("%dth data block free addres: ", i);
for (int j = 2; j >= 0; j--) { for (int j = 2; j >= 0; j--) {
fs->deallocate_datablock(&inode_list[i], &(rec_datablock_free[i][j])); fs->deallocate_datablock(&inode_list[i], &(rec_datablock_free[i][j]));
// printf("", rec_datablock_free[i][j]); printf("%llu,", rec_datablock_free[i][j]);
} }
// printf("\n"); printf("\n");
} }
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
// printf("%dth data block allocate again addres: ", i); printf("%dth data block allocate again addres: ", i);
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
fs->allocate_datablock(&inode_list[i], &temp_block_num); fs->allocate_datablock(&inode_list[i], &temp_block_num);
assert(temp_block_num == rec_datablock_free[i][j]); //assert(temp_block_num == rec_datablock_free[i][j]);
// printf("%d," ,inode_inside[i].datablock_allocate(*H)); printf("%llu," ,itemp_block_num);
} }
// printf("\n"); printf("\n");
} }
// printf("}\n"); // printf("}\n");