mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 07:37:35 +00:00
LibCore: Simplify Core::Notifier by only allowing one event type
Not a single client of this API actually used the event mask feature to listen for readability AND writability. Let's simplify the API and have only one hook: on_activation.
This commit is contained in:
parent
1587caef84
commit
411d36719e
24 changed files with 80 additions and 99 deletions
|
@ -188,7 +188,7 @@ ErrorOr<NonnullRefPtr<FileWatcher>> FileWatcher::create(FileWatcherFlags flags)
|
|||
if (watcher_fd < 0)
|
||||
return Error::from_errno(errno);
|
||||
|
||||
auto notifier = Notifier::construct(watcher_fd, Notifier::Event::Read);
|
||||
auto notifier = Notifier::construct(watcher_fd, Notifier::Type::Read);
|
||||
return adopt_ref(*new FileWatcher(watcher_fd, move(notifier)));
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ FileWatcher::FileWatcher(int watcher_fd, NonnullRefPtr<Notifier> notifier)
|
|||
: FileWatcherBase(watcher_fd)
|
||||
, m_notifier(move(notifier))
|
||||
{
|
||||
m_notifier->on_ready_to_read = [this] {
|
||||
m_notifier->on_activation = [this] {
|
||||
auto maybe_event = get_event_from_fd(m_notifier->fd(), m_wd_to_path);
|
||||
if (maybe_event.has_value()) {
|
||||
auto event = maybe_event.value();
|
||||
|
@ -214,7 +214,7 @@ FileWatcher::FileWatcher(int watcher_fd, NonnullRefPtr<Notifier> notifier)
|
|||
|
||||
FileWatcher::~FileWatcher()
|
||||
{
|
||||
m_notifier->on_ready_to_read = nullptr;
|
||||
m_notifier->on_activation = nullptr;
|
||||
close(m_notifier->fd());
|
||||
dbgln_if(FILE_WATCHER_DEBUG, "Stopped watcher at fd {}", m_notifier->fd());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue