drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[Victoria Falls] Clean up directory probe debug printing

This commit is contained in:
Drew Galbraith 2023-07-31 23:54:41 -07:00
parent 3dce058562
commit bed685af65
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/victoriafalls/fs/ext2/ext2.h
View File

@ -63,6 +63,10 @@ struct Inode {
uint32_t osd2[3]; uint32_t osd2[3];
} __attribute__((__packed__)); } __attribute__((__packed__));
constexpr uint8_t kExt2FtUnknown = 0;
constexpr uint8_t kExt2FtFile = 1;
constexpr uint8_t kExt2FtDirectory = 2;
struct DirEntry { struct DirEntry {
uint32_t inode; uint32_t inode;
uint16_t record_length; uint16_t record_length;

22
sys/victoriafalls/fs/ext2/ext2_driver.cpp
View File

@ -51,11 +51,6 @@ glcr::ErrorCode Ext2Driver::ProbePartition() {
glcr::UniquePtr<InodeTable>(new InodeTable(ext2_reader_, bgds)); glcr::UniquePtr<InodeTable>(new InodeTable(ext2_reader_, bgds));
ASSIGN_OR_RETURN(Inode * root, inode_table_->GetInode(2)); ASSIGN_OR_RETURN(Inode * root, inode_table_->GetInode(2));
dbgln("Inode %lx", root);
dbgln("Mode: %x", root->mode);
dbgln("Blocks: %x", root->blocks);
dbgln("Size: %x", root->size);
return ProbeDirectory(root); return ProbeDirectory(root);
} }
@ -81,14 +76,17 @@ glcr::ErrorCode Ext2Driver::ProbeDirectory(Inode* inode) {
uint64_t addr = block.vaddr(); uint64_t addr = block.vaddr();
while (addr < block.vaddr() + ext2_reader_.BlockSize()) { while (addr < block.vaddr() + ext2_reader_.BlockSize()) {
DirEntry* entry = reinterpret_cast<DirEntry*>(addr); DirEntry* entry = reinterpret_cast<DirEntry*>(addr);
dbgln("Entry: inode: %x, rec_len %x, name_len %x, file_type: %x",
entry->inode, entry->record_length, entry->name_len,
entry->file_type);
// FIXME: We need a method to construct a string that is *up to* a certain
// length. As illustrated below the provided name_len is 0x2e but the
// first character is \0 since this is the self-referencial inode.
glcr::String name(entry->name, entry->name_len); glcr::String name(entry->name, entry->name_len);
dbgln("%s", name.cstr()); switch (entry->file_type) {
case kExt2FtFile:
dbgln("FILE (0x%x): %s", entry->inode, name.cstr());
break;
case kExt2FtDirectory:
dbgln("DIR (0x%x): %s", entry->inode, name.cstr());
break;
default:
dbgln("UNK (0x%x): %s", entry->inode, name.cstr());
}
addr += entry->record_length; addr += entry->record_length;
} }
} }