PIProtectedVariable - user now can`t mistake

PIHTTPServer improvements

libs/main/http_server/pihttpserver.h

@@ -1,8 +1,7 @@
 #ifndef PIHTTPSERVER_H
 #define PIHTTPSERVER_H
 
-#include "microhttpd_server_p.h"
-#include "pip_http_server_export.h"
+#include "microhttpd_server.h"
 
 class PIP_HTTP_SERVER_EXPORT PIHTTPServer: public MicrohttpdServer {
 	PIOBJECT_SUBCLASS(PIHTTPServer, MicrohttpdServer)
@@ -13,7 +12,10 @@ public:
 
 	using RequestFunction = std::function<MicrohttpdServer::Reply(const MicrohttpdServer::Request &)>;
 
-	void registerPath(const PIString & path, RequestFunction functor);
+	void registerPath(const PIString & path, MicrohttpdServer::Method method, RequestFunction functor);
+	void registerUnhandled(RequestFunction functor);
+	void unregisterPath(const PIString & path, MicrohttpdServer::Method method);
+	void unregisterPath(const PIString & path);
 
 	void addReplyHeader(const PIString & name, const PIString & value) { reply_headers[name] = value; }
 	void removeReplyHeader(const PIString & name) { reply_headers.remove(name); }
@@ -23,10 +25,12 @@ private:
 	struct Endpoint {
 		bool match(const PIStringList & in_path) const;
 		PIStringList path;
+		MicrohttpdServer::Method method = MicrohttpdServer::Method::Unknown;
 		RequestFunction function;
 	};
 	PIMap<PIString, PIString> reply_headers;
 	PIMap<PIString, Endpoint> functions;
+	RequestFunction unhandled;
 };
 
 

libs/main/http_server/pihttpservermodule.h

@@ -0,0 +1,54 @@
+/*
+    PIP - Platform Independent Primitives
+    Module includes
+    Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+    This program 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 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+//! \defgroup HTTPServer HTTPServer
+//! \~\brief
+//! \~english HTTP server
+//! \~russian HTTP сервер
+//!
+//! \~\details
+//! \~english \section cmake_module_HTTPServer Building with CMake
+//! \~russian \section cmake_module_HTTPServer Сборка с использованием CMake
+//!
+//! \~\code
+//! find_package(PIP REQUIRED)
+//! target_link_libraries([target] PIP::HTTPServer)
+//! \endcode
+//!
+//! \~english \par Common
+//! \~russian \par Общее
+//!
+//! \~english
+//! These files provides HTTP server based on libmicrohttpd
+//!
+//! \~russian
+//! Эти файлы обеспечивают HTTP сервер, основанный на libmicrohttpd
+//!
+//! \~\authors
+//! \~english
+//! Ivan Pelipenko peri4ko@yandex.ru;
+//! \~russian
+//! Иван Пелипенко peri4ko@yandex.ru;
+//!
+
+#ifndef pihttpservermodule_H
+#define pihttpservermodule_H
+
+#include "pihttpserver.h"
+
+#endif

libs/main/pip.h

@@ -27,6 +27,7 @@
 #include "picoremodule.h"
 #include "picryptmodule.h"
 #include "pigeomodule.h"
+#include "pihttpservermodule.h"
 #include "piiodevicesmodule.h"
 #include "piioutilsmodule.h"
 #include "piliterals.h"

libs/main/thread/piprotectedvariable.h

@@ -32,6 +32,28 @@
 template<typename T>
 class PIP_EXPORT PIProtectedVariable {
 public:
+	//! \~english
+	//! \~russian
+	class PIP_EXPORT Pointer {
+		friend class PIProtectedVariable<T>;
+
+	public:
+		Pointer(const Pointer & v): pv(v.pv), counter(v.counter + 1) {}
+		~Pointer() {
+			if (counter == 0) pv.mutex.unlock();
+		}
+
+		T * operator->() { return &pv.var; }
+		T & operator*() { return pv.var; }
+
+	private:
+		Pointer() = delete;
+		Pointer(PIProtectedVariable<T> & v): pv(v) {}
+
+		PIProtectedVariable<T> & pv;
+		int counter = 0;
+	};
+
 	//! \~english Sets value to \"v\"
 	//! \~russian Устанавливает значение как \"v\"
 	void set(T v) {
@@ -39,6 +61,13 @@ public:
 		var = std::move(v);
 	}
 
+	//! \~english Lock mutex and returns reference wrapper of value. Unlock on variable destructor.
+	//! \~russian Блокирует мьютекс и возвращает класс-обертку на значение. Разблокирует в деструкторе переменной.
+	Pointer getRef() {
+		mutex.lock();
+		return Pointer(*this);
+	}
+
 	//! \~english Returns copy of value
 	//! \~russian Возвращает копию значения
 	T get() const {
@@ -46,17 +75,6 @@ public:
 		return var;
 	}
 
-	//! \~english Lock mutex and returns reference of value
-	//! \~russian Блокирует мьютекс и возвращает ссылку на значение
-	T & lock() {
-		mutex.lock();
-		return var;
-	}
-
-	//! \~english Unlock mutex
-	//! \~russian Разблокирует мьютекс
-	void unlock() { mutex.unlock(); }
-
 	//! \~english Sets value to \"v\"
 	//! \~russian Устанавливает значение как \"v\"
 	PIProtectedVariable<T> & operator=(T v) {