Changed event supplier to avoid polymorphic inheritance

Sebastiano Merlino · Sebastiano Merlino · commit d2b1c097aa97 · 2013-01-12T16:44:48.000+01:00
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -96,30 +96,59 @@ class logging_delegate
         virtual void log_error(const std::string& s) const;
 };
 
+template <typename CHILD>
 class event_supplier
 {
     public:
-        event_supplier();
+        event_supplier()
+        {
+        }
 
-        virtual ~event_supplier();
+        ~event_supplier()
+        {
+        }
 
-        virtual void supply_events(
+        void supply_events(
                 fd_set* read_fdset, 
                 fd_set* write_fdset, 
                 fd_set* exc_fdset, 
                 int* max
-        ) const ;
+        ) const
+        {
+            static_cast<CHILD*>(this)->supply_events(
+                    read_fdset, write_fdset, exc_fdset, max
+            );
+        }
 
-        virtual long get_timeout() const;
+        long get_timeout() const
+        {
+            return static_cast<CHILD*>(this)->get_timeout();
+        }
 
-        virtual void dispatch_events() const;
+        void dispatch_events() const
+        {
+            static_cast<CHILD*>(this)->dispatch_events();
+        }
 };
 
 class create_webserver;
 
 typedef bool(*validator_ptr)(const std::string&);
 typedef void(*unescaper_ptr)(char*);
 
+typedef void(*supply_events_ptr)(
+                fd_set*, 
+                fd_set*, 
+                fd_set*, 
+                int*
+        );
+
+typedef long(*get_timeout_ptr)();
+
+typedef void(*dispatch_events_ptr)();
+
+struct event_tuple;
+
 /**
  * Class representing the webserver. Main class of the apis.
 **/
@@ -261,7 +290,9 @@ class webserver
             this->unescaper = unescaper;
         }
 
-        void register_event_supplier(const std::string& id, event_supplier* ev_supplier);
+        template<typename T>
+        void register_event_supplier(const std::string& id, event_supplier<T>* ev_supplier);
+        void remove_event_supplier(const std::string& id);
 
         void run();
 
@@ -336,7 +367,7 @@ class webserver
         std::vector<details::daemon_item*> daemons;
         std::vector<pthread_t> threads;
 
-        std::map<std::string, event_supplier*> event_suppliers;
+        std::map<std::string, event_tuple*> event_suppliers;
 
         void init(http_resource* single_resource);
         static void* select(void* self);
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -281,6 +281,21 @@ struct cache_entry
     }
 };
 
+struct event_tuple
+{
+    supply_events_ptr supply_events;
+    get_timeout_ptr get_timeout;
+    dispatch_events_ptr dispatch_events;
+
+    template<typename T>
+    event_tuple(event_supplier<T>* es)
+    {
+        supply_events(std::bind1st(std::mem_fun(&T::supply_events), es));
+        get_timeout(std::bind1st(std::mem_fun(&T::get_timeout), es));
+        dispatch_events(std::bind1st(std::mem_fun(&T::dispatch_events), es));
+    }
+};
+
 using namespace http;
 
 int policy_callback (void *, const struct sockaddr*, socklen_t);
@@ -327,20 +342,6 @@ void logging_delegate::log_access(const string& s) const {}
 
 void logging_delegate::log_error(const string& s) const {}
 
-//EVENT SUPPLIER
-event_supplier::event_supplier() {}
-
-event_supplier::~event_supplier() {}
-
-void event_supplier::supply_events(fd_set* read_fdset, fd_set* write_fdset, fd_set* exc_fdset, int* max) const {}
-
-long event_supplier::get_timeout() const
-{
-    return 0L;
-} 
-
-void event_supplier::dispatch_events() const {} 
-
 //WEBSERVER CREATOR
 create_webserver& create_webserver::https_mem_key(const std::string& https_mem_key)
 {
@@ -654,7 +655,7 @@ void* webserver::select(void* self)
         }
 
         {
-            std::map<std::string, event_supplier*>::const_iterator it;
+            std::map<std::string, event_tuple*>::const_iterator it;
             pthread_rwlock_rdlock(&di->ws->runguard);
             for(it = di->ws->event_suppliers.begin(); it != di->ws->event_suppliers.end(); ++it)
             {
@@ -704,7 +705,7 @@ void* webserver::select(void* self)
         ::select (max + 1, &rs, &ws, &es, &timeout_value);
         MHD_run (di->daemon);
         {
-            std::map<std::string, event_supplier*>::const_iterator it;
+            std::map<std::string, event_tuple*>::const_iterator it;
             pthread_rwlock_rdlock(&di->ws->runguard);
             for(it = di->ws->event_suppliers.begin(); it != di->ws->event_suppliers.end(); ++it)
             {
@@ -1866,10 +1867,27 @@ void webserver::get_response(cache_entry* ce, http_response** res)
     *res = ce->response.ptr();
 }
 
-void webserver::register_event_supplier(const std::string& id, event_supplier* ev)
+template<typename T>
+void webserver::register_event_supplier(const std::string& id, event_supplier<T>* ev)
+{
+    pthread_rwlock_wrlock(&runguard);
+    map<string, event_tuple*>::iterator it = event_suppliers.find(id);
+    if(it != event_suppliers.end())
+        delete it->second;
+    event_suppliers[id] = new event_tuple(&ev);
+    pthread_rwlock_unlock(&runguard);
+}
+
+void webserver::remove_event_supplier(const std::string& id)
 {
     pthread_rwlock_wrlock(&runguard);
-    event_suppliers[id] = ev;
+    map<string, event_tuple*>::iterator it = event_suppliers.find(id);
+    if(it != event_suppliers.end())
+    {
+        event_tuple* evp(it->second);
+        event_suppliers.erase(it);
+        delete evp;
+    }
     pthread_rwlock_unlock(&runguard);
 }
 
