TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-18 17:15:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Optimize read to only read the hierarchy once

Browse Source
This commit is contained in:
Baptiste Wicht 2013-12-26 17:25:17 +01:00
parent 6e7f1b588d
commit b6337900af
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/src/fat32.cpp
View File

@ -495,6 +495,8 @@ std::string fat32::read_file(dd disk, const disks::partition_descriptor& partiti
return {}; return {};
} }
uint32_t cluster_number;
size_t file_size = 0; size_t file_size = 0;
auto found = false; auto found = false;
auto all_files = files(disk, path); auto all_files = files(disk, path);
@ -502,6 +504,7 @@ std::string fat32::read_file(dd disk, const disks::partition_descriptor& partiti
if(f.file_name == file){ if(f.file_name == file){
found = true; found = true;
file_size = f.size; file_size = f.size;
cluster_number = f.location;
break; break;
} }
} }
@ -510,20 +513,6 @@ std::string fat32::read_file(dd disk, const disks::partition_descriptor& partiti
return {}; return {};
} }
std::vector<std::string> complete_path;
for(auto& p : path){
complete_path.push_back(p);
}
complete_path.push_back(file);
auto cluster_number_search = find_cluster_number(disk, complete_path);
if(!cluster_number_search.first){
return {};
}
auto cluster_number = cluster_number_search.second;
std::string content(file_size + 1); std::string content(file_size + 1);
size_t read = 0; size_t read = 0;