Separate timer_watcher into a class

Author: hamid

CMakeLists.txt

@@ -31,6 +31,7 @@ link_directories("/usr/local/lib")
 
 
 add_library(event_loop
+  ${PROJECT_SOURCE_DIR}/event_loop/timer_watcher.cpp
   ${PROJECT_SOURCE_DIR}/event_loop/socket_watcher.cpp
   ${PROJECT_SOURCE_DIR}/event_loop/event_loop_ev.cpp)
 

includes/libevpp/event_loop/event_loop_ev.h

@@ -1,48 +1,18 @@
 #pragma once
 
 #include "../event_loop/socket_watcher.h"
+#include "../event_loop/timer_watcher.h"
 #include <memory>
 
 namespace libevpp {
   namespace event_loop
   {
-    typedef std::function<bool ()> timer_action;
 
     class event_loop_ev
     {
     public:
       using socket_identifier_t = std::unique_ptr<socket_watcher>;
 
-    private:
-      struct timer_watcher
-      {
-        timer_action timeout_cb;
-        ev_timer timer;
-        double time_;
-        struct ev_loop* loop_;
-
-        timer_watcher(struct ev_loop* loop, double time, timer_action&& cb)
-          : timeout_cb(std::move(cb)), time_(time), loop_(loop)
-        {
-          ev_timer_init (&timer, &event_loop_ev::timer_handler, time, 0.);
-          timer.data = this;
-        }
-
-        void start() {
-          ev_timer_start (loop_, &timer);
-        }
-
-        void repeat() {
-          timer.repeat = time_;
-          ev_timer_again(loop_, &timer);
-        }
-
-        ~timer_watcher() {
-          ev_timer_stop(loop_, &timer);
-        }
-      };
-
-
     public:
       event_loop_ev();
       event_loop_ev(struct ev_loop *);
@@ -56,8 +26,6 @@ namespace libevpp {
       bool async_read(socket_identifier_t& id, action&& cb);
       void async_timeout(double time, timer_action&& cb );
 
-    private:
-      static void timer_handler(EV_P_ ev_timer* w, int revents);
 
     private:
       struct ev_loop* loop_;

includes/libevpp/event_loop/timer_watcher.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <ev.h>
+#include <functional>
+
+namespace libevpp {
+namespace event_loop {
+
+typedef std::function<bool ()> timer_action;
+
+class timer_watcher
+{
+ public:
+  timer_watcher(struct ev_loop* loop, double time, timer_action&& cb);
+  ~timer_watcher();
+
+  void start();
+  void repeat();
+
+ private:
+  static void timer_handler(EV_P_ ev_timer* w, int revents);
+
+ private:
+  timer_action timeout_cb;
+  ev_timer timer;
+  double time_;
+  struct ev_loop* loop_;
+};
+
+
+}
+}

src/event_loop/event_loop_ev.cpp

@@ -42,15 +42,6 @@ void event_loop_ev::async_timeout(double time, timer_action&& cb )
   w->start();
 }
 
-void event_loop_ev::timer_handler(EV_P_ ev_timer* w, int revents)
-{
-  timer_watcher *watcher = reinterpret_cast<timer_watcher*>(w->data);
-  if (!watcher->timeout_cb()) {
-    delete watcher;
-    return;
-  }
-  watcher->repeat();
-}
 
 
 event_loop_ev::socket_identifier_t event_loop_ev::watch(int fd)

src/event_loop/timer_watcher.cpp

@@ -0,0 +1,37 @@
+#include <libevpp/event_loop/timer_watcher.h>
+
+namespace libevpp {
+namespace event_loop {
+
+timer_watcher::timer_watcher(struct ev_loop* loop, double time, timer_action&& cb)
+  : timeout_cb(std::move(cb)), time_(time), loop_(loop)
+{
+  ev_timer_init (&timer, &timer_watcher::timer_handler, time, 0.);
+  timer.data = this;
+}
+
+timer_watcher::~timer_watcher() {
+  ev_timer_stop(loop_, &timer);
+}
+
+void timer_watcher::start() {
+  ev_timer_start (loop_, &timer);
+}
+
+void timer_watcher::repeat() {
+  timer.repeat = time_;
+  ev_timer_again(loop_, &timer);
+}
+
+void timer_watcher::timer_handler(EV_P_ ev_timer* w, int revents)
+{
+  timer_watcher *watcher = reinterpret_cast<timer_watcher*>(w->data);
+  if (!watcher->timeout_cb()) {
+    delete watcher;
+    return;
+  }
+  watcher->repeat();
+}
+
+}
+}