diff options
| author | Max Kellermann <max@duempel.org> | 2016-03-05 20:14:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2016-03-05 20:23:30 +0100 |
| commit | 0e87ce4680df5cc66225b7a20f1c09938ae885cd (patch) | |
| tree | 26cf71b27ac26dccdf862bc10e86a26a77c65c9d /src/Instance.hxx | |
| parent | b4d594eeff22d112d224341b40db2893589a63df (diff) | |
GlobalEvents: expose the internal class
Move the GlobalEvents::Monitor instance into class Instance.
Eliminate all global variables.
Diffstat (limited to 'src/Instance.hxx')
| -rw-r--r-- | src/Instance.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Instance.hxx b/src/Instance.hxx index fcb087d08..ff0b484f0 100644 --- a/src/Instance.hxx +++ b/src/Instance.hxx @@ -22,6 +22,7 @@ #include "check.h" #include "event/Loop.hxx" +#include "GlobalEvents.hxx" #include "Compiler.h" #ifdef ENABLE_NEIGHBOR_PLUGINS @@ -36,7 +37,6 @@ class Storage; class UpdateService; #endif -class EventLoop; class Error; class ClientList; struct Partition; @@ -57,6 +57,8 @@ struct Instance final { EventLoop event_loop; + GlobalEvents::Monitor global_events; + #ifdef ENABLE_NEIGHBOR_PLUGINS NeighborGlue *neighbors; #endif @@ -77,6 +79,8 @@ struct Instance final Partition *partition; + Instance():global_events(event_loop) {} + /** * Initiate shutdown. Wrapper for EventLoop::Break(). */ |