Removed caching mechanism.

The design is badly though and currently not used by customers.
The current design doesn't fully handle management of the cache
and is hence half managed with responsibility of the users. A new
design will be developed with a fully managed design (in the meantime
it would be simpler for users to just manage their caching independently).

Author: etr

src/Makefile.am

@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I../ -I$(srcdir)/httpserver/
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_request.cpp http_response.cpp http_resource.cpp details/comet_manager.cpp details/http_endpoint.cpp
-noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/cache_entry.hpp httpserver/details/comet_manager.hpp gettext.h
+noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/comet_manager.hpp gettext.h
 nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/http_response_builder.hpp
 
 AM_CXXFLAGS += -fPIC -Wall

src/http_response.cpp

@@ -53,7 +53,6 @@ http_response::http_response(const http_response_builder& builder):
     keepalive_msg(builder._keepalive_msg),
     send_topic(builder._send_topic),
     underlying_connection(0x0),
-    ce(builder._ce),
     cycle_callback(builder._cycle_callback),
     get_raw_response(this, builder._get_raw_response),
     decorate_response(this, builder._decorate_response),
@@ -69,7 +68,6 @@ http_response::http_response(const http_response_builder& builder):
 
 http_response::~http_response()
 {
-    if(ce != 0x0) webserver::unlock_cache_entry(ce);
 }
 
 //RESPONSE
@@ -116,10 +114,6 @@ int http_response::enqueue_response_str(
     return MHD_queue_response(connection, response_code, response);
 }
 
-void http_response::decorate_response_cache(MHD_Response* response)
-{
-}
-
 int http_response::enqueue_response_basic(
         MHD_Connection* connection,
         MHD_Response* response
@@ -167,23 +161,6 @@ void http_response::get_raw_response_file(
     }
 }
 
-void http_response::get_raw_response_cache(
-        MHD_Response** response,
-        webserver* ws
-)
-{
-    bool valid;
-    http_response* r;
-    if(ce == 0x0)
-        r = ws->get_from_cache(content, &valid, &ce, true, false);
-    else
-        webserver::get_response(ce, &r);
-    r->get_raw_response(response, ws);
-    r->decorate_response(*response); //It is done here to avoid to search two times for the same element
-
-    //TODO: Check if element is not in cache and throw exception
-}
-
 namespace details
 {
 

src/httpserver/details/cache_entry.hpp

@@ -48,7 +48,6 @@ namespace details
 {
     struct http_response_ptr;
     ssize_t cb(void*, uint64_t, char*, size_t);
-    struct cache_entry;
 };
 
 class bad_caching_attempt: public std::exception
@@ -90,7 +89,6 @@ class http_response
             keepalive_msg(b.keepalive_msg),
             send_topic(b.send_topic),
             underlying_connection(b.underlying_connection),
-            ce(b.ce),
             cycle_callback(b.cycle_callback),
             get_raw_response(this, b._get_raw_response),
             decorate_response(this, b._decorate_response),
@@ -108,7 +106,6 @@ class http_response
             response_code(-1),
             fp(-1),
             underlying_connection(0x0),
-            ce(0x0),
             completed(false),
             ws(0x0),
             connection_id(0x0)
@@ -234,7 +231,6 @@ class http_response
         std::string keepalive_msg;
         std::string send_topic;
         struct MHD_Connection* underlying_connection;
-        details::cache_entry* ce;
         cycle_callback_ptr cycle_callback;
 
         const get_raw_response_t get_raw_response;
@@ -254,10 +250,8 @@ class http_response
                 webserver* ws = 0x0);
 
         void get_raw_response_lp_send(MHD_Response** res, webserver* ws = 0x0);
-        void get_raw_response_cache(MHD_Response** res, webserver* ws = 0x0);
         void get_raw_response_deferred(MHD_Response** res, webserver* ws = 0x0);
         void decorate_response_str(MHD_Response* res);
-        void decorate_response_cache(MHD_Response* res);
         void decorate_response_deferred(MHD_Response* res);
         int enqueue_response_str(MHD_Connection* connection, MHD_Response* res);
 

src/httpserver/http_response.hpp

@@ -40,11 +40,6 @@ namespace http
     class header_comparator;
 };
 
-namespace details
-{
-    struct cache_entry;
-};
-
 struct byte_string
 {
     public:
@@ -91,7 +86,6 @@ class http_response_builder
             _keepalive_secs(-1),
             _keepalive_msg(""),
             _send_topic(""),
-            _ce(0x0),
             _get_raw_response(&http_response::get_raw_response_str),
             _decorate_response(&http_response::decorate_response_str),
             _enqueue_response(&http_response::enqueue_response_str)
@@ -118,7 +112,6 @@ class http_response_builder
             _keepalive_secs(-1),
             _keepalive_msg(""),
             _send_topic(""),
-            _ce(0x0),
             _get_raw_response(&http_response::get_raw_response_str),
             _decorate_response(&http_response::decorate_response_str),
             _enqueue_response(&http_response::enqueue_response_str)
@@ -140,7 +133,6 @@ class http_response_builder
             _keepalive_secs(b._keepalive_secs),
             _keepalive_msg(b._keepalive_msg),
             _send_topic(b._send_topic),
-            _ce(b._ce),
             _get_raw_response(b._get_raw_response),
             _decorate_response(b._decorate_response),
             _enqueue_response(b._enqueue_response)
@@ -162,7 +154,6 @@ class http_response_builder
             _keepalive_secs = b._keepalive_secs;
             _keepalive_msg = b._keepalive_msg;
             _send_topic = b._send_topic;
-            _ce = b._ce;
             _get_raw_response = b._get_raw_response;
             _decorate_response = b._decorate_response;
             _enqueue_response = b._enqueue_response;
@@ -224,13 +215,6 @@ class http_response_builder
             return *this;
         }
 
-        http_response_builder& cache_response()
-        {
-            _get_raw_response = &http_response::get_raw_response_cache;
-            _decorate_response = &http_response::decorate_response_cache;
-            return *this;
-        }
-
         http_response_builder& deferred_response(cycle_callback_ptr cycle_callback)
         {
             _cycle_callback = cycle_callback;
@@ -275,20 +259,11 @@ class http_response_builder
         std::string _keepalive_msg;
         std::string _send_topic;
         cycle_callback_ptr _cycle_callback;
-        details::cache_entry* _ce;
 
         void (http_response::*_get_raw_response)(MHD_Response**, webserver*);
         void (http_response::*_decorate_response)(MHD_Response*);
         int (http_response::*_enqueue_response)(MHD_Connection*, MHD_Response*);
 
-        http_response_builder& cache_response(details::cache_entry* ce)
-        {
-            _ce = ce;
-            _get_raw_response = &http_response::get_raw_response_cache;
-            _decorate_response = &http_response::decorate_response_cache;
-            return *this;
-        }
-
         friend class http_response;
 };
 

src/httpserver/http_response_builder.hpp

@@ -61,7 +61,6 @@ struct httpserver_ska;
 namespace details {
     struct daemon_item;
     struct modded_request;
-    struct cache_entry;
     class comet_manager;
 }
 
@@ -121,22 +120,6 @@ class webserver
             std::string& message
         );
 
-        http_response* get_from_cache(const std::string& key, bool* valid,
-                bool lock = false, bool write = false
-        );
-        http_response* get_from_cache(const std::string& key, bool* valid,
-                details::cache_entry** ce, bool lock = false, bool write = false
-        );
-        void lock_cache_element(details::cache_entry* ce, bool write = false);
-        void unlock_cache_element(details::cache_entry* ce);
-        details::cache_entry* put_in_cache(const std::string& key, http_response* value,
-                bool* new_elem, bool lock = false,
-                bool write = false, int validity = -1
-        );
-        void remove_from_cache(const std::string& key);
-        bool is_valid(const std::string& key);
-        void clean_cache();
-
         log_access_ptr get_access_logger() const
         {
             return this->log_access;
@@ -213,9 +196,7 @@ class webserver
         std::map<details::http_endpoint, http_resource*> registered_resources;
         std::map<std::string, http_resource*> registered_resources_str;
 
-        std::map<std::string, details::cache_entry*> response_cache;
         int next_to_choose;
-        pthread_rwlock_t cache_guard;
         std::set<http::ip_representation> bans;
         std::set<http::ip_representation> allowances;
 
@@ -276,10 +257,6 @@ class webserver
             void **con_cls, int upgrade_socket
         );
 
-        static void unlock_cache_entry(details::cache_entry*);
-        static void lock_cache_entry(details::cache_entry*);
-        static void get_response(details::cache_entry*, http_response** res);
-
         int bodyless_requests_answer(MHD_Connection* connection,
             const char* method, const char* version,
             struct details::modded_request* mr