zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-21 18:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

block off shared readers to worker threads.

Browse source 
The file system should be thread safe now.
This commit is contained in:
Christoph Oelckers 2023-12-13 22:47:24 +01:00
parent 737e3f22d7
commit 799679bf6c
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/filesystem/include/resourcefile.h
View file

@ -107,6 +107,8 @@ struct FResourceEntry
int16_t Namespace;
};
void SetMainThread();
class FResourceFile
{
public:

2
src/common/filesystem/source/filesystem.cpp
View file

@ -245,6 +245,8 @@ bool FileSystem::InitMultipleFiles (std::vector<std::string>& filenames, LumpFil
{
int numfiles;
// the first call here will designate a main thread which may use shared file readers. All other thewads have to open new file handles.
SetMainThread();
// open all the files, load headers, and count lumps
DeleteAll();
numfiles = 0;

16
src/common/filesystem/source/resourcefile.cpp
View file

@ -45,6 +45,18 @@
namespace FileSys {
// this is for restricting shared file readers to the main thread.
thread_local bool mainThread;
void SetMainThread()
{
// only set the global flag on the first thread calling this.
static bool done = false;
if (!done)
{
mainThread = done = true;
}
}
std::string ExtractBaseName(const char* path, bool include_extension)
{
const char* src, * dot;
@ -553,6 +565,8 @@ FileReader FResourceFile::GetEntryReader(uint32_t entry, int readertype, int rea
}
if (!(Entries[entry].Flags & RESFF_COMPRESSED))
{
if (readertype == READER_SHARED && mainThread)
readertype = READER_NEW;
if (readertype == READER_SHARED)
{
fr.OpenFilePart(Reader, Entries[entry].Position, Entries[entry].Length);
@ -571,7 +585,7 @@ FileReader FResourceFile::GetEntryReader(uint32_t entry, int readertype, int rea
else
{
FileReader fri;
if (readertype == READER_NEW) fri.OpenFile(FileName, Entries[entry].Position, Entries[entry].CompressedSize);
if (readertype == READER_NEW || !mainThread) fri.OpenFile(FileName, Entries[entry].Position, Entries[entry].CompressedSize);
else fri.OpenFilePart(Reader, Entries[entry].Position, Entries[entry].CompressedSize);
int flags = DCF_TRANSFEROWNER | DCF_EXCEPTIONS;
if (readertype == READER_CACHED) flags |= DCF_CACHED;