Skip to content

M
mpd
Commit 07add0bd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Instance: add base class which owns the EventLoop

parent 9a9b6fa3
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
src/Instance.hxx
View file @ 07add0bd
...@@ -42,9 +42,18 @@ class ClientList; ...@@ -42,9 +42,18 @@ class ClientList;
struct Partition; struct Partition;
class StateFile; class StateFile;
/**
* A utility class which, when used as the first base class, ensures
* that the #EventLoop gets initialized before the other base classes.
*/
struct EventLoopHolder {
EventLoop event_loop;
};
struct Instance final struct Instance final
: EventLoopHolder
#if defined(ENABLE_DATABASE) || defined(ENABLE_NEIGHBOR_PLUGINS) #if defined(ENABLE_DATABASE) || defined(ENABLE_NEIGHBOR_PLUGINS)
: ,
#endif #endif
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
public DatabaseListener public DatabaseListener
...@@ -56,8 +65,6 @@ struct Instance final ...@@ -56,8 +65,6 @@ struct Instance final
public NeighborListener public NeighborListener
#endif #endif
{ {
EventLoop event_loop;
GlobalEvents::Monitor global_events; GlobalEvents::Monitor global_events;
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment