Epoll refactor

[platform/core/security/vasum.git] / common / epoll / glib-poll-dispatcher.hpp

diff --git a/common/utils/glib-poll-dispatcher.hpp b/common/epoll/glib-poll-dispatcher.hpp
similarity index 80%
rename from common/utils/glib-poll-dispatcher.hpp
rename to common/epoll/glib-poll-dispatcher.hpp
index 07da0c3..cf300bb 100644 (file)
--- a/common/utils/glib-poll-dispatcher.hpp
+++ b/common/epoll/glib-poll-dispatcher.hpp
@@ -22,32 +22,35 @@
  * @brief   glib epoll dispatcher
  */
 
-#ifndef COMMON_UTILS_GLIB_POLL_DISPATCHER_HPP
-#define COMMON_UTILS_GLIB_POLL_DISPATCHER_HPP
+#ifndef COMMON_EPOLL_GLIB_POLL_DISPATCHER_HPP
+#define COMMON_EPOLL_GLIB_POLL_DISPATCHER_HPP
 
-#include "utils/event-poll.hpp"
+#include "epoll/event-poll.hpp"
 #include "utils/callback-guard.hpp"
 
 #include <gio/gio.h>
 
 namespace vasum {
-namespace utils {
+namespace epoll {
 
 /**
  * Will dispatch poll events in glib thread
  */
 class GlibPollDispatcher {
 public:
-    GlibPollDispatcher(EventPoll& poll);
+    GlibPollDispatcher();
     ~GlibPollDispatcher();
+
+    EventPoll& getPoll();
 private:
-    CallbackGuard mGuard;
+    EventPoll mPoll; // before mGuard!
+    utils::CallbackGuard mGuard;
     GIOChannel* mChannel;
     guint mWatchId;
 };
 
 
-} // namespace utils
+} // namespace epoll
 } // namespace vasum
 
 #endif // COMMON_UTILS_GLIB_POLL_DISPATCHER_HPP