Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iso9660: Root caching (rereverting)

This commit is contained in:
JlXip 2021-02-22 18:37:30 +01:00
parent 326bcbfa29
commit 1a5cb00cda
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
stage23/fs/iso9660.c
View File

@ -68,6 +68,11 @@ struct iso9660_primary_volume {
// --- Implementation ---
struct iso9660_contexts_node {
struct iso9660_context context;
struct iso9660_contexts_node *next;
};
stage3_data struct iso9660_contexts_node *contexts = NULL;
stage3_text static void iso9660_find_PVD(struct iso9660_volume_descriptor *desc, struct volume *vol) {
uint32_t lba = ISO9660_FIRST_VOLUME_DESCRIPTOR;
@ -97,6 +102,24 @@ stage3_text static void iso9660_cache_root(struct volume *vol,
volume_read(vol, *root, pv.root.extent.little * ISO9660_SECTOR_SIZE, *root_size);
}
stage3_text static struct iso9660_context *iso9660_get_context(struct volume *vol) {
struct iso9660_contexts_node *current = contexts;
while (current) {
if (current->context.vol.drive == vol->drive)
return &current->context;
current = current->next;
}
// The context is not cached at this point
struct iso9660_contexts_node *node = ext_mem_alloc(sizeof(struct iso9660_contexts_node));
node->context.vol = *vol;
iso9660_cache_root(vol, &node->context.root, &node->context.root_size);
node->next = contexts;
contexts = node;
return &node->context;
}
stage3_text static int iso9660_strcmp(const char *a, const char *b, size_t size) {
while (size--) {
char ca = *a++;
@ -146,15 +169,13 @@ stage3_text int iso9660_check_signature(struct volume *vol) {
}
stage3_text int iso9660_open(struct iso9660_file_handle *ret, struct volume *vol, const char *path) {
iso9660_cache_root(vol, &ret->context.root, &ret->context.root_size);
ret->context.vol = *vol;
ret->context = iso9660_get_context(vol);
while (*path == '/')
++path;
struct iso9660_directory_entry *current = ret->context.root;
uint32_t current_size = ret->context.root_size;
struct iso9660_directory_entry *current = ret->context->root;
uint32_t current_size = ret->context->root_size;
uint32_t next_sector = 0;
uint32_t next_size = 0;
@ -187,6 +208,6 @@ stage3_text int iso9660_open(struct iso9660_file_handle *ret, struct volume *vol
}
stage3_text int iso9660_read(struct iso9660_file_handle *file, void *buf, uint64_t loc, uint64_t count) {
volume_read(&file->context.vol, buf, file->LBA * ISO9660_SECTOR_SIZE + loc, count);
volume_read(&file->context->vol, buf, file->LBA * ISO9660_SECTOR_SIZE + loc, count);
return 0;
}

2
stage23/fs/iso9660.h
View File

@ -13,7 +13,7 @@ struct iso9660_context {
};
struct iso9660_file_handle {
struct iso9660_context context;
struct iso9660_context *context;
uint32_t LBA;
uint32_t size;
};