GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix crash on editor close on Linux due to FS watcher double free

Browse Source
This commit is contained in:
Wojtek Figat
2021-10-03 18:27:33 +02:00
parent 2f64312a7d
commit 51bcaeb812
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Platform/Linux/LinuxFileSystemWatcher.cpp
View File

@@ -19,6 +19,7 @@
namespace FileSystemWatchers
{
CriticalSection Locker;
int32 Count = 0;
Dictionary<int, LinuxFileSystemWatcher*> RootWatchers;
Dictionary<int, Pair<int, Pair<String, LinuxFileSystemWatcher*>>> Watchers;
@@ -161,6 +162,7 @@ namespace FileSystemWatchers
LinuxFileSystemWatcher::LinuxFileSystemWatcher(const String& directory, bool withSubDirs, int rootWatcher)
: FileSystemWatcherBase(directory, withSubDirs)
, RootWatcher(rootWatcher)
{
FileSystemWatchers::Locker.Lock();
if (!FileSystemWatchers::Thread)
@@ -176,6 +178,8 @@ LinuxFileSystemWatcher::LinuxFileSystemWatcher(const String& directory, bool wit
{
const StringAsANSI<250> directoryAnsi(*directory, directory.Length());
WachedDirectory = inotify_add_watch(FileSystemWatchers::WacherFileDescriptor, directoryAnsi.Get(), IN_MODIFY | IN_CREATE | IN_DELETE);
if (rootWatcher == -1)
FileSystemWatchers::Count++;
FileSystemWatchers::Watchers[WachedDirectory] = Pair<int, Pair<String, LinuxFileSystemWatcher*>>(rootWatcher, Pair<String, LinuxFileSystemWatcher*>(directory, this));
if (withSubDirs)
{
@@ -194,8 +198,10 @@ LinuxFileSystemWatcher::~LinuxFileSystemWatcher()
inotify_rm_watch(FileSystemWatchers::WacherFileDescriptor, WachedDirectory);
FileSystemWatchers::RootWatchers.Remove(WachedDirectory);
FileSystemWatchers::Watchers.Remove(WachedDirectory);
if (RootWatcher == -1)
FileSystemWatchers::Count--;
}
if (FileSystemWatchers::RootWatchers.IsEmpty() && FileSystemWatchers::Thread)
if (FileSystemWatchers::Count == 0 && FileSystemWatchers::Thread)
{
FileSystemWatchers::ThreadActive = false;
FileSystemWatchers::Thread->Join();

5
Source/Engine/Platform/Linux/LinuxFileSystemWatcher.h
View File

@@ -18,8 +18,8 @@ public:
/// </summary>
/// <param name="directory">The directory to watch.</param>
/// <param name="withSubDirs">True if monitor the directory tree rooted at the specified directory or just a given directory.</param>
/// <param name="root">Linux specific root directory watcher file descriptor.</param>
LinuxFileSystemWatcher(const String& directory, bool withSubDirs, int root= -1);
/// <param name="rootWatcher">Linux specific root directory watcher file descriptor.</param>
LinuxFileSystemWatcher(const String& directory, bool withSubDirs, int rootWatcher = -1);
/// <summary>
/// Finalizes an instance of the <see cref="LinuxFileSystemWatcher"/> class.
@@ -36,6 +36,7 @@ public:
private:
int WachedDirectory;
int RootWatcher;
};
#endif