LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed deadlock at shutdown

Browse source
This commit is contained in:
Mikulas Florek 2021-05-28 16:01:22 +02:00
parent f7befb98d2
commit 1f0f12bd1c
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/editor/linux/file_system_watcher.cpp
View file

@ -6,6 +6,7 @@
#include "engine/string.h"
#include "file_system_watcher.h"
#include <sys/inotify.h>
#include <sys/select.h>
#include <unistd.h>
@ -150,19 +151,29 @@ int FileSystemWatcherTask::task()
char buf[4096];
while (!finished)
{
int r = read(fd, buf, sizeof(buf));
if(r == -1) return 1;
if (finished) return 0;
auto* event = (inotify_event*)buf;
fd_set rfds;
FD_ZERO (&rfds);
FD_SET (fd, &rfds);
timeval timeout;
timeout.tv_sec=0;
timeout.tv_usec=100000;
while ((char*)event < buf + r)
{
char tmp[LUMIX_MAX_PATH];
getName(*this, event, tmp, Lumix::lengthOf(tmp));
if (event->mask & IN_CREATE) addWatch(*this, tmp, root_length);
watcher.callback.invoke(tmp);
if(select(FD_SETSIZE, &rfds, NULL, NULL, &timeout) > 0)
{
int r = read(fd, buf, sizeof(buf));
if (finished) return 0;
if(r == -1) return 1;
auto* event = (inotify_event*)buf;
event = (inotify_event*)((char*)event + sizeof(*event) + event->len);
while ((char*)event < buf + r)
{
char tmp[LUMIX_MAX_PATH];
getName(*this, event, tmp, Lumix::lengthOf(tmp));
if (event->mask & IN_CREATE) addWatch(*this, tmp, root_length);
watcher.callback.invoke(tmp);
event = (inotify_event*)((char*)event + sizeof(*event) + event->len);
}
}
}