Handle ownership of ev_loop in event_loop_ev

Author: hamid

includes/libevpp/event_loop/event_loop_ev.h

@@ -16,6 +16,7 @@ namespace libevpp {
     public:
       event_loop_ev();
       event_loop_ev(struct ev_loop *);
+      ~event_loop_ev();
 
       void run();
 
@@ -26,9 +27,9 @@ namespace libevpp {
       bool async_read(socket_identifier_t& id, action&& cb);
       void async_timeout(double time, timer_action&& cb );
 
-
     private:
       struct ev_loop* loop_;
+      const bool loop_owner_;
     };
   }
 }

includes/libevpp/event_loop/timer_watcher.h

@@ -16,12 +16,13 @@ class timer_watcher
 
   void start();
   void repeat();
+  void stop();
 
  private:
   static void timer_handler(EV_P_ ev_timer* w, int revents);
 
  private:
-  timer_action timeout_cb;
+  timer_action&& timeout_cb;
   ev_timer timer;
   double time_;
   struct ev_loop* loop_;

src/event_loop/event_loop_ev.cpp

@@ -4,15 +4,21 @@ namespace libevpp {
 namespace event_loop {
 
 event_loop_ev::event_loop_ev()
-  : loop_(EV_DEFAULT)
+  : loop_(EV_DEFAULT), loop_owner_(true)
 {
 }
 
 event_loop_ev::event_loop_ev(struct ev_loop* loop)
-  : loop_(loop)
+  : loop_(loop), loop_owner_(false)
 {
 }
 
+event_loop_ev::~event_loop_ev()
+{
+  if (loop_owner_)
+    ev_loop_destroy(loop_);
+}
+
 void event_loop_ev::run()
 {
   ev_run(loop_, 0);
@@ -42,8 +48,6 @@ void event_loop_ev::async_timeout(double time, timer_action&& cb )
   w->start();
 }
 
-
-
 event_loop_ev::socket_identifier_t event_loop_ev::watch(int fd)
 {
   return std::make_unique<socket_watcher>(loop_, fd);

src/event_loop/timer_watcher.cpp

@@ -11,13 +11,17 @@ timer_watcher::timer_watcher(struct ev_loop* loop, double time, timer_action&& c
 }
 
 timer_watcher::~timer_watcher() {
-  ev_timer_stop(loop_, &timer);
+  stop();
 }
 
 void timer_watcher::start() {
   ev_timer_start (loop_, &timer);
 }
 
+void timer_watcher::stop() {
+  ev_timer_stop(loop_, &timer);
+}
+
 void timer_watcher::repeat() {
   timer.repeat = time_;
   ev_timer_again(loop_, &timer);