zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplified the directory reader a little bit 

* we do not need to make a second allocation for the systemFilePath
* as systemFilePath is never null, there is no need to check for that case.
* moved systemFilePath into a separate array to save memory on other file types.
This commit is contained in:
Christoph Oelckers 2023-12-24 08:30:15 +01:00
parent f8dcc33e6d
commit baa9251741
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/filesystem/include/resourcefile.h
View File

@ -105,7 +105,6 @@ struct FResourceEntry
uint16_t Flags;
uint16_t Method;
int16_t Namespace;
const char* SystemFilePath;
};
void SetMainThread();

9
src/common/filesystem/source/file_directory.cpp
View File

@ -58,6 +58,8 @@ class FDirectory : public FResourceFile
{
const bool nosubdir;
const char* mBasePath;
const char** SystemFilePath;
int AddDirectory(const char* dirpath, LumpFilterInfo* filter, FileSystemMessageFunc Printf);
@ -102,6 +104,7 @@ int FDirectory::AddDirectory(const char *dirpath, LumpFilterInfo* filter, FileSy
{
mBasePath = nullptr;
AllocateEntries((int)list.size());
SystemFilePath = (const char**)stringpool->Alloc(list.size() * sizeof(const char*));
for(auto& entry : list)
{
if (mBasePath == nullptr)
@ -131,7 +134,7 @@ int FDirectory::AddDirectory(const char *dirpath, LumpFilterInfo* filter, FileSy
}
// for internal access we use the normalized form of the relative path.
Entries[count].FileName = NormalizeFileName(entry.FilePathRel.c_str());
Entries[count].SystemFilePath = stringpool->Strdup(Entries[count].FileName);
SystemFilePath[count] = Entries[count].FileName;
Entries[count].CompressedSize = Entries[count].Length = entry.Length;
Entries[count].Flags = RESFF_FULLPATH;
Entries[count].ResourceID = -1;
@ -170,9 +173,7 @@ FileReader FDirectory::GetEntryReader(uint32_t entry, int readertype, int)
if (entry < NumLumps)
{
std::string fn = mBasePath;
fn += Entries[entry].SystemFilePath ?
Entries[entry].SystemFilePath :
Entries[entry].FileName;
fn += SystemFilePath[entry];
fr.OpenFile(fn.c_str());
if (readertype == READER_CACHED)
{