RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

CEventLoop: Remove some no-longer-used virtuals.

Browse source
This commit is contained in:
Andreas Kling 2019-07-20 15:50:03 +02:00
parent 98929ba715
commit 26c29e59ec
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Libraries/LibCore/CEventLoop.cpp
View file

@ -101,13 +101,9 @@ int CEventLoop::exec()
void CEventLoop::pump(WaitMode mode) void CEventLoop::pump(WaitMode mode)
{ {
// window server event processing... if (m_queued_events.is_empty())
do_processing();
if (m_queued_events.is_empty()) {
wait_for_event(mode); wait_for_event(mode);
do_processing();
}
decltype(m_queued_events) events; decltype(m_queued_events) events;
{ {
LOCKER(m_lock); LOCKER(m_lock);
@ -171,7 +167,6 @@ void CEventLoop::wait_for_event(WaitMode mode)
}; };
int max_fd_added = -1; int max_fd_added = -1;
add_file_descriptors_for_select(rfds, max_fd_added);
add_fd_to_set(s_wake_pipe_fds[0], rfds); add_fd_to_set(s_wake_pipe_fds[0], rfds);
max_fd = max(max_fd, max_fd_added); max_fd = max(max_fd, max_fd_added);
for (auto& notifier : *s_notifiers) { for (auto& notifier : *s_notifiers) {
@ -252,8 +247,6 @@ void CEventLoop::wait_for_event(WaitMode mode)
post_event(*notifier, make<CNotifierWriteEvent>(notifier->fd())); post_event(*notifier, make<CNotifierWriteEvent>(notifier->fd()));
} }
} }
process_file_descriptors_after_select(rfds);
} }
bool CEventLoop::EventLoopTimer::has_expired(const timeval& now) const bool CEventLoop::EventLoopTimer::has_expired(const timeval& now) const

5
Libraries/LibCore/CEventLoop.h
View file

@ -52,11 +52,6 @@ public:
static void wake(); static void wake();
protected:
virtual void add_file_descriptors_for_select(fd_set&, int& max_fd) { UNUSED_PARAM(max_fd); }
virtual void process_file_descriptors_after_select(const fd_set&) {}
virtual void do_processing() {}
private: private:
void wait_for_event(WaitMode); void wait_for_event(WaitMode);
void get_next_timer_expiration(timeval&); void get_next_timer_expiration(timeval&);