mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-10 06:01:52 +00:00
Code Issues Releases Activity

fs.mitm: Save memory+time in sibling reconstruction via reverse iteration

Browse source
This commit is contained in:
Michael Scire 2018-06-29 00:34:18 -06:00
parent 4c920dfe92
commit 83c9747e5f
2 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
stratosphere/fs_mitm/source/fsmitm_romfsbuild.cpp
View file

@ -269,18 +269,14 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
this->file_partition_size += cur_file->size; this->file_partition_size += cur_file->size;
cur_file->entry_offset = entry_offset; cur_file->entry_offset = entry_offset;
entry_offset += sizeof(RomFSFileEntry) + ((cur_file->path_len - cur_file->cur_path_ofs + 3) & ~3); entry_offset += sizeof(RomFSFileEntry) + ((cur_file->path_len - cur_file->cur_path_ofs + 3) & ~3);
/* Assign deferred parent/sibling ownership. */
if (cur_file->parent->file == NULL) {
cur_file->parent->file = cur_file;
cur_file->parent->tail = cur_file;
} else {
((RomFSBuildFileContext *)cur_file->parent->tail)->sibling = cur_file;
cur_file->parent->tail = cur_file;
}
prev_file = cur_file; prev_file = cur_file;
} }
/* Assign deferred parent/sibling ownership. */
for (auto it = this->files.rbegin(); it != this->files.rend(); it++) {
cur_file = it->second;
cur_file->sibling = cur_file->parent->file;
cur_file->parent->file = cur_file;
}
/* Determine directory offsets. */ /* Determine directory offsets. */
entry_offset = 0; entry_offset = 0;
@ -288,17 +284,12 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
cur_dir = it.second; cur_dir = it.second;
cur_dir->entry_offset = entry_offset; cur_dir->entry_offset = entry_offset;
entry_offset += sizeof(RomFSDirectoryEntry) + ((cur_dir->path_len - cur_dir->cur_path_ofs + 3) & ~3); entry_offset += sizeof(RomFSDirectoryEntry) + ((cur_dir->path_len - cur_dir->cur_path_ofs + 3) & ~3);
}
/* Assign deferred parent/sibling ownership. */ /* Assign deferred parent/sibling ownership. */
if (cur_dir != this->root) { for (auto it = this->directories.rbegin(); it->second != this->root; it++) {
if (cur_dir->parent->child == NULL) { cur_dir = it->second;
cur_dir->parent->child = cur_dir; cur_dir->sibling = cur_dir->parent->child;
cur_dir->parent->tail = cur_dir; cur_dir->parent->child = cur_dir;
} else {
((RomFSBuildDirectoryContext *)cur_dir->parent->tail)->sibling = cur_dir;
cur_dir->parent->tail = cur_dir;
}
}
} }
@ -384,7 +375,7 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
header->file_table_ofs = header->file_hash_table_ofs + header->file_hash_table_size; header->file_table_ofs = header->file_hash_table_ofs + header->file_hash_table_size;
/* For debugging, uncomment this to get a log of the generated metadata tables. */ /* For debugging, uncomment this to get a log of the generated metadata tables. */
/*
{ {
FsFileSystem sd_fs; FsFileSystem sd_fs;
if (R_SUCCEEDED(fsMountSdcard(&sd_fs))) { if (R_SUCCEEDED(fsMountSdcard(&sd_fs))) {
@ -399,7 +390,7 @@ void RomFSBuildContext::Build(std::vector<RomFSSourceInfo> *out_infos) {
fsFsClose(&sd_fs); fsFsClose(&sd_fs);
} }
} }
*/
out_infos->emplace_back(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource::Memory); out_infos->emplace_back(header->dir_hash_table_ofs, this->dir_hash_table_size + this->dir_table_size + this->file_hash_table_size + this->file_table_size, metadata, RomFSDataSource::Memory);
} }

1
stratosphere/fs_mitm/source/fsmitm_romfsbuild.hpp
View file

@ -153,7 +153,6 @@ struct RomFSBuildDirectoryContext {
RomFSBuildDirectoryContext *child = NULL; RomFSBuildDirectoryContext *child = NULL;
RomFSBuildDirectoryContext *sibling = NULL; RomFSBuildDirectoryContext *sibling = NULL;
RomFSBuildFileContext *file = NULL; RomFSBuildFileContext *file = NULL;
void *tail;
}; };
struct RomFSBuildFileContext { struct RomFSBuildFileContext {