Skip to content

fix: cap watcher directories to wait-object limit #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OpenSteam001 merged 3 commits into from
May 28, 2026
Merged

fix: cap watcher directories to wait-object limit #58

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b362d3
fix: cap watcher directories to wait-object limit
H-Chris233 May 25, 2026
e35af03
Merge branch 'main' into fix-filewatcher-max-wait-objects
H-Chris233 May 27, 2026
5363b6f
Merge branch 'main' into fix-filewatcher-max-wait-objects
OpenSteam001 May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Utils/FileWatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ namespace FileWatcher {

static void WatcherThread() {
const size_t numDirs = g_watchDirs.size();
if (numDirs == 0) {
LOG_PACKAGE_WARN("No directories configured for watcher");
return;
}

std::vector<HANDLE> dirHandles(numDirs, nullptr);
std::vector<OVERLAPPED> overlapped(numDirs);
std::vector<HANDLE> events(numDirs, nullptr);
Expand Down Expand Up @@ -199,11 +204,23 @@ namespace FileWatcher {
}

void Start(const std::vector<std::string>& directories) {
if (directories.empty()) {
LOG_PACKAGE_WARN("No directories configured for watcher start");
return;
}

std::vector<std::string> effectiveDirs = directories;
if (effectiveDirs.size() > MAXIMUM_WAIT_OBJECTS) {
LOG_PACKAGE_WARN("Too many watch directories: {} (max supported by WaitForMultipleObjects: {})",
effectiveDirs.size(), MAXIMUM_WAIT_OBJECTS);
effectiveDirs.resize(MAXIMUM_WAIT_OBJECTS);
}

if (g_running.exchange(true)) {
LOG_PACKAGE_WARN("Already running");
return;
}
g_watchDirs = directories;
g_watchDirs = effectiveDirs;
g_watcherThread = std::thread(WatcherThread);
}

Expand Down
Loading