Extracted other classes from webserver.cpp

Sebastiano Merlino · Sebastiano Merlino · commit dcfa5a723804 · 2014-01-25T15:21:17.000Z
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = -I../ -I$(srcdir)/httpserver/
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_endpoint.cpp http_request.cpp http_response.cpp http_resource.cpp
-noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp gettext.h
+noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp httpserver/details/cache_entry.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/event_supplier.hpp httpserver/details/event_tuple.hpp httpserver/details/http_resource_mirror.hpp
 AM_CXXFLAGS += -fPIC -Wall
 libhttpserver_la_LIBADD = -lmicrohttpd
diff --git a/src/httpserver/details/cache_entry.hpp b/src/httpserver/details/cache_entry.hpp
@@ -0,0 +1,137 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#ifndef _CACHE_ENTRY_HPP_
+#define _CACHE_ENTRY_HPP_
+
+#include <pthread.h>
+#include <set>
+#include "details/http_response_ptr.hpp"
+
+namespace httpserver
+{
+namespace details
+{
+
+struct pthread_t_comparator
+{
+    bool operator()(const pthread_t& t1, const pthread_t& t2) const
+    {
+        return pthread_equal(t1, t2);
+    }
+};
+
+struct cache_entry
+{
+    long ts;
+    int validity;
+    details::http_response_ptr response;
+    pthread_rwlock_t elem_guard;
+    pthread_mutex_t lock_guard;
+    std::set<pthread_t, pthread_t_comparator> lockers;
+
+    cache_entry():
+        ts(-1),
+        validity(-1)
+    {
+        pthread_rwlock_init(&elem_guard, NULL);
+        pthread_mutex_init(&lock_guard, NULL);
+    }
+
+    ~cache_entry()
+    {
+        pthread_rwlock_destroy(&elem_guard);
+        pthread_mutex_destroy(&lock_guard);
+    }
+
+    cache_entry(const cache_entry& b):
+        ts(b.ts),
+        validity(b.validity),
+        response(b.response),
+        elem_guard(b.elem_guard),
+        lock_guard(b.lock_guard)
+    {
+    }
+
+    void operator= (const cache_entry& b)
+    {
+        ts = b.ts;
+        validity = b.validity;
+        response = b.response;
+        pthread_rwlock_destroy(&elem_guard);
+        pthread_mutex_destroy(&lock_guard);
+        elem_guard = b.elem_guard;
+    }
+
+    cache_entry(
+            details::http_response_ptr response,
+            long ts = -1,
+            int validity = -1
+    ):
+        ts(ts),
+        validity(validity),
+        response(response)
+    {
+        pthread_rwlock_init(&elem_guard, NULL);
+        pthread_mutex_init(&lock_guard, NULL);
+    }
+
+    void lock(bool write = false)
+    {
+        pthread_mutex_lock(&lock_guard);
+        pthread_t tid = pthread_self();
+        if(!lockers.count(tid))
+        {
+            if(write)
+            {
+                lockers.insert(tid);
+                pthread_mutex_unlock(&lock_guard);
+                pthread_rwlock_wrlock(&elem_guard);
+            }
+            else
+            {
+                lockers.insert(tid);
+                pthread_mutex_unlock(&lock_guard);
+                pthread_rwlock_rdlock(&elem_guard);
+            }
+        }
+        else
+            pthread_mutex_unlock(&lock_guard);
+    }
+
+    void unlock()
+    {
+        pthread_mutex_lock(&lock_guard);
+        {
+            pthread_t tid = pthread_self();
+            if(lockers.count(tid))
+            {
+                lockers.erase(tid);
+                pthread_rwlock_unlock(&elem_guard);
+            }
+        }
+        pthread_mutex_unlock(&lock_guard);
+    }
+};
+
+} //details
+} //httpserver
+
+#endif //_CACHE_ENTRY_HPP_
diff --git a/src/httpserver/details/http_response_ptr.hpp b/src/httpserver/details/http_response_ptr.hpp
@@ -1,3 +1,26 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#ifndef _HTTP_RESPONSE_PTR_HPP_
+#define _HTTP_RESPONSE_PTR_HPP_
+
 namespace httpserver
 {
 
@@ -89,3 +112,5 @@ struct http_response_ptr
 
 } //details
 } //httpserver
+
+#endif //_HTTP_RESPONSE_PTR_HPP_
diff --git a/src/httpserver/details/modded_request.hpp b/src/httpserver/details/modded_request.hpp
@@ -1,3 +1,26 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#ifndef _MODDED_REQUEST_HPP_
+#define _MODDED_REQUEST_HPP_
+
 #include "binders.hpp"
 #include "details/http_response_ptr.hpp"
 
@@ -49,3 +72,5 @@ struct modded_request
 } //details
 
 } //httpserver
+
+#endif //_MODDED_REQUEST_HPP_
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -36,7 +36,6 @@ namespace httpserver
 {
 
 class webserver;
-struct cache_entry;
 
 namespace http
 {
@@ -48,6 +47,7 @@ namespace details
 {
     struct http_response_ptr;
     ssize_t cb(void*, uint64_t, char*, size_t);
+    struct cache_entry;
 };
 
 using namespace http;
@@ -84,7 +84,7 @@ http_response \
     int keepalive_secs,\
     const std::string keepalive_msg,\
     const std::string send_topic,\
-    cache_entry* ce\
+    details::cache_entry* ce\
 ):\
     content(content),\
     response_code(response_code),\
@@ -139,7 +139,7 @@ class http_response
             int keepalive_secs = -1,
             const std::string keepalive_msg = "",
             const std::string send_topic = "",
-            cache_entry* ce = 0x0
+            details::cache_entry* ce = 0x0
         ):
             content(content),
             response_code(response_code),
@@ -441,7 +441,7 @@ class http_response
         struct MHD_Connection* underlying_connection;
         void(*ca)(void*);
         void* closure_data;
-        cache_entry* ce;
+        details::cache_entry* ce;
 
         const get_raw_response_t get_raw_response;
         const decorate_response_t decorate_response;
@@ -680,7 +680,7 @@ class cache_response : public http_response
         }
         cache_response
         (
-            cache_entry* ce
+            details::cache_entry* ce
         ) : http_response(this, "", 200, "", true, "", "", false,
                 std::vector<std::string>(), -1, "", "", ce
             )
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -51,7 +51,6 @@ namespace httpserver {
 
 template<typename CHILD> class http_resource;
 class http_response;
-struct cache_entry;
 template<typename CHILD> class event_supplier;
 class create_webserver;
 
@@ -66,6 +65,7 @@ namespace details {
     class http_endpoint;
     class daemon_item;
     class modded_request;
+    struct cache_entry;
 }
 
 /**
@@ -140,11 +140,11 @@ class webserver
                 bool lock = false, bool write = false
         );
         http_response* get_from_cache(const std::string& key, bool* valid,
-                cache_entry** ce, bool lock = false, bool write = false
+                details::cache_entry** ce, bool lock = false, bool write = false
         );
-        void lock_cache_element(cache_entry* ce, bool write = false);
-        void unlock_cache_element(cache_entry* ce);
-        cache_entry* put_in_cache(const std::string& key, http_response* value,
+        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
         );
@@ -252,7 +252,7 @@ class webserver
         std::map<details::http_endpoint, details::http_resource_mirror> registered_resources;
         std::map<std::string, details::http_resource_mirror*> registered_resources_str;
 
-        std::map<std::string, cache_entry*> response_cache;
+        std::map<std::string, details::cache_entry*> response_cache;
         int next_to_choose;
         pthread_rwlock_t cache_guard;
 #ifdef USE_CPP_ZEROX
@@ -338,9 +338,9 @@ class webserver
             void **con_cls, int upgrade_socket
         );
 
-        static void unlock_cache_entry(cache_entry*);
-        static void lock_cache_entry(cache_entry*);
-        static void get_response(cache_entry*, http_response** res);
+        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,
diff --git a/src/webserver.cpp b/src/webserver.cpp
