Activated COMET subsystem

Changed INTERNAL_SELECT to use a remanaged connection system.

Author: Sebastiano Merlino

src/http_response.cpp

@@ -229,8 +229,6 @@ void http_response::get_raw_response_lp_receive(
         webserver* ws
 )
 {
-
-#ifdef USE_COMET
     this->ws = ws;
     this->connection_id = MHD_get_connection_info(
             this->underlying_connection,
@@ -246,13 +244,6 @@ void http_response::get_raw_response_lp_receive(
             keepalive_secs,
             keepalive_msg
     );
-
-#else //USE_COMET
-
-    http_response::get_raw_response(response, ws);
-
-#endif //USE_COMET
-
 }
 
 ssize_t long_polling_receive_response::data_generator(
@@ -262,7 +253,6 @@ ssize_t long_polling_receive_response::data_generator(
         size_t max
 )
 {
-#ifdef USE_COMET
     long_polling_receive_response* _this = 
         static_cast<long_polling_receive_response*>(cls);
 
@@ -275,20 +265,15 @@ ssize_t long_polling_receive_response::data_generator(
     }
     else
         return 0;
-#else //USE_COMET
-    return 0;
-#endif //USE_COMET
 }
 
 void http_response::get_raw_response_lp_send(
         MHD_Response** response,
         webserver* ws
 )
 {
-    http_response::get_raw_response(response, ws);
-#ifdef USE_COMET
+    http_response::get_raw_response_str(response, ws);
     ws->send_message_to_topic(send_topic, content);
-#endif //USE_COMET
 }
 
 };

src/httpserver/http_response.hpp

@@ -108,7 +108,9 @@ class http_response
             get_raw_response(this, &http_response::get_raw_response_str),
             decorate_response(this, &http_response::decorate_response_str),
             enqueue_response(this, &http_response::enqueue_response_str),
-            completed(false)
+            completed(false),
+            ws(0x0),
+            connection_id(-1)
         {
             set_header(http_utils::http_header_content_type, content_type);
         }
@@ -139,7 +141,9 @@ class http_response
             get_raw_response(b.get_raw_response),
             decorate_response(b.decorate_response),
             enqueue_response(b.enqueue_response),
-            completed(b.completed)
+            completed(b.completed),
+            ws(b.ws),
+            connection_id(b.connection_id)
         {
         }
 
@@ -383,6 +387,9 @@ class http_response
 
         bool completed;
 
+        webserver* ws;
+        int connection_id;
+
         void get_raw_response_str(MHD_Response** res, webserver* ws = 0x0);
         void get_raw_response_file(MHD_Response** res, webserver* ws = 0x0);
         void get_raw_response_switch_r(MHD_Response** res, webserver* ws = 0x0);
@@ -465,7 +472,9 @@ inline http_response::http_response<TYPE> \
     get_raw_response(this, &http_response::get_raw_response_## S1),\
     decorate_response(this, &http_response::decorate_response_## S2),\
     enqueue_response(this, &http_response::enqueue_response_## S3),\
-    completed(false)\
+    completed(false),\
+    ws(0x0),\
+    connection_id(-1)\
 {\
     set_header(http_utils::http_header_content_type, content_type);\
 }
@@ -629,12 +638,11 @@ class long_polling_receive_response : public http_response
         long_polling_receive_response(const http_response& b) : http_response(b)
         {
         }
-    private:
+
         static ssize_t data_generator (void* cls, uint64_t pos,
                 char* buf, size_t max
         );
-        int connection_id;
-        httpserver::webserver* ws;
+
         friend class webserver;
 };
 

src/httpserver/http_utils.hpp

@@ -74,10 +74,9 @@ class http_utils
 
     enum start_method_T
     {
-        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY,
+        INTERNAL_SELECT = MHD_NO_FLAG,
         THREADS = MHD_USE_THREAD_PER_CONNECTION,
-        POLL = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL,
-        INTERNAL_REMANAGED = MHD_NO_FLAG
+        POLL = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
     };
 
     enum policy_T

src/httpserver/webserver.hpp

@@ -241,7 +241,7 @@ namespace details
                             int*
                     );
 
-            typedef long(*get_timeout_ptr)();
+            typedef struct timeval(*get_timeout_ptr)();
             typedef void(*dispatch_events_ptr)();
             supply_events_ptr supply_events;
             get_timeout_ptr get_timeout;
@@ -293,7 +293,7 @@ class event_supplier
             );
         }
 
-        long get_timeout() const
+        struct timeval get_timeout() const
         {
             return static_cast<CHILD*>(this)->get_timeout();
         }
@@ -508,15 +508,13 @@ class webserver
 
         void remove_event_supplier(const std::string& id);
 
-        void run();
-
         /**
          * Method used to kill the webserver waiting for it to terminate
         **/
         void sweet_kill();
     private:
         const int port;
-        const http_utils::start_method_T start_method;
+        http_utils::start_method_T start_method;
         const int max_threads;
         const int max_connections;
         const int memory_limit;
@@ -588,7 +586,7 @@ class webserver
 
         void init(render_ptr single_resource);
         static void* select(void* self);
-        void schedule_fd(int fd, fd_set* schedule_list, int* max);
+//        void schedule_fd(int fd, fd_set* schedule_list, int* max);
         static void* cleaner(void* self);
         void clean_connections();