summaryrefslogtreecommitdiff
path: root/src/config/ConfigWatcher.cpp
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2026-03-20 13:52:37 -0400
committerGitHub <noreply@github.com>2026-03-20 17:52:37 +0000
commit8726a7363eb9213235e6e23657668e0daac39a5b (patch)
tree42eeb40f6f81a9ccec1455f308e56173e9dcce4b /src/config/ConfigWatcher.cpp
parentb940b0d2c197841b0f648598ee782dbaf9e0a89b (diff)
config: cleanup the entire config infrastructure (#13785)
Massively refactors the config infrastructure, sorely needed and will be req'd for the lua stuff
Diffstat (limited to 'src/config/ConfigWatcher.cpp')
-rw-r--r--src/config/ConfigWatcher.cpp101
1 files changed, 0 insertions, 101 deletions
diff --git a/src/config/ConfigWatcher.cpp b/src/config/ConfigWatcher.cpp
deleted file mode 100644
index 83f3011c..00000000
--- a/src/config/ConfigWatcher.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#include "ConfigWatcher.hpp"
-#if defined(__linux__)
-#include <linux/limits.h>
-#endif
-#include <sys/inotify.h>
-#include "../debug/log/Logger.hpp"
-#include <ranges>
-#include <fcntl.h>
-#include <unistd.h>
-#include <filesystem>
-
-using namespace Hyprutils::OS;
-
-CConfigWatcher::CConfigWatcher() : m_inotifyFd(inotify_init()) {
- if (!m_inotifyFd.isValid()) {
- Log::logger->log(Log::ERR, "CConfigWatcher couldn't open an inotify node. Config will not be automatically reloaded");
- return;
- }
-
- // TODO: make CFileDescriptor take F_GETFL, F_SETFL
- const int FLAGS = fcntl(m_inotifyFd.get(), F_GETFL, 0);
- if (fcntl(m_inotifyFd.get(), F_SETFL, FLAGS | O_NONBLOCK) < 0) {
- Log::logger->log(Log::ERR, "CConfigWatcher couldn't non-block inotify node. Config will not be automatically reloaded");
- m_inotifyFd.reset();
- return;
- }
-}
-
-CFileDescriptor& CConfigWatcher::getInotifyFD() {
- return m_inotifyFd;
-}
-
-void CConfigWatcher::setWatchList(const std::vector<std::string>& paths) {
-
- // we clear all watches first, because whichever fired is now invalid
- // or that is at least what it seems to be.
- // since we don't know which fired,
- // plus it doesn't matter that much, these ops are done rarely and fast anyways.
-
- // cleanup old paths
- for (auto& watch : m_watches) {
- inotify_rm_watch(m_inotifyFd.get(), watch.wd);
- }
-
- m_watches.clear();
-
- // add new paths
- for (const auto& path : paths) {
- m_watches.emplace_back(SInotifyWatch{
- .wd = inotify_add_watch(m_inotifyFd.get(), path.c_str(), IN_MODIFY | IN_DONT_FOLLOW),
- .file = path,
- });
-
- std::error_code ec, ec2;
- const auto CANONICAL = std::filesystem::canonical(path, ec);
- const auto IS_SYMLINK = std::filesystem::is_symlink(path, ec2);
- if (!ec && !ec2 && IS_SYMLINK) {
- m_watches.emplace_back(SInotifyWatch{
- .wd = inotify_add_watch(m_inotifyFd.get(), CANONICAL.c_str(), IN_MODIFY),
- .file = path,
- });
- }
- }
-}
-
-void CConfigWatcher::setOnChange(const std::function<void(const SConfigWatchEvent&)>& fn) {
- m_watchCallback = fn;
-}
-
-void CConfigWatcher::onInotifyEvent() {
- constexpr size_t BUFFER_SIZE = sizeof(inotify_event) + NAME_MAX + 1;
- alignas(inotify_event) std::array<char, BUFFER_SIZE> buffer = {};
- const ssize_t bytesRead = read(m_inotifyFd.get(), buffer.data(), buffer.size());
- if (bytesRead <= 0)
- return;
-
- for (size_t offset = 0; offset < sc<size_t>(bytesRead);) {
- const auto* ev = rc<const inotify_event*>(buffer.data() + offset);
-
- if (offset + sizeof(inotify_event) > sc<size_t>(bytesRead)) {
- Log::logger->log(Log::ERR, "CConfigWatcher: malformed inotify event, truncated header");
- break;
- }
-
- if (offset + sizeof(inotify_event) + ev->len > sc<size_t>(bytesRead)) {
- Log::logger->log(Log::ERR, "CConfigWatcher: malformed inotify event, truncated name field");
- break;
- }
-
- const auto WD = std::ranges::find_if(m_watches, [wd = ev->wd](const auto& e) { return e.wd == wd; });
-
- if (WD == m_watches.end())
- Log::logger->log(Log::ERR, "CConfigWatcher: got an event for wd {} which we don't have?!", ev->wd);
- else
- m_watchCallback(SConfigWatchEvent{
- .file = WD->file,
- });
-
- offset += sizeof(inotify_event) + ev->len;
- }
-}