Merge pull request #130 from c-jimenez/dev/rpc_pool

[rpc] RPC pool implementation + memory leaks fixes

Author: c-jimenez

CMakeLists.txt

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 2.6 protocol"
+project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 protocol"
                  VERSION 1.2.0
 )
 
@@ -101,7 +101,11 @@ target_link_libraries(open-ocpp-dynamic
     ws
     websockets
 )
-set_target_properties(open-ocpp-dynamic PROPERTIES OUTPUT_NAME "open-ocpp")
+set_target_properties(open-ocpp-dynamic PROPERTIES
+    OUTPUT_NAME "open-ocpp"
+    VERSION ${PROJECT_VERSION}
+    SOVERSION ${PROJECT_VERSION_MAJOR}
+)
 
 # Install commands
 include(GNUInstallDirs)

examples/common/config/CentralSystemConfig.h

@@ -84,6 +84,14 @@ class CentralSystemConfig : public ocpp::config::ICentralSystemConfig
     /** @brief Maximum number of entries in the log (0 = no logs in database) */
     unsigned int logMaxEntriesCount() const override { return get<unsigned int>("LogMaxEntriesCount"); }
 
+    // Behavior
+
+    /** @brief Size of the thread pool to handle incoming requests from the Charge Points */
+    unsigned int incomingRequestsFromCpThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCpThreadPoolSize");
+    };
+
     // ISO 15118 PnC extensions
 
     /** @brief If this variable set to true, then the Central System supports ISO 15118 plug and charge messages via the DataTransfer mechanism as

examples/common/config/LocalControllerConfig.h

@@ -87,6 +87,16 @@ class LocalControllerConfig : public ocpp::config::ILocalControllerConfig
 
     // Behavior
 
+    /** @brief Size of the thread pool to handle incoming requests from the Charge Points */
+    unsigned int incomingRequestsFromCpThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCpThreadPoolSize");
+    };
+    /** @brief Size of the thread pool to handle incoming requests from the Central System */
+    unsigned int incomingRequestsFromCsThreadPoolSize() const override
+    {
+        return get<unsigned int>("IncomingRequestsFromCsThreadPoolSize");
+    };
     /** @brief Disconnect from Charge Point on Central System disconnection */
     bool disconnectFromCpWhenCsDisconnected() const override { return getBool("DisconnectFromCpWhenCsDisconnected"); }
 

examples/iso15118_centralsystem/config/iso15118_centralsystem.ini

@@ -16,4 +16,5 @@ TlsServerCertificatePrivateKeyPassphrase=
 TlsServerCertificateCa=../../examples/certificates/open-ocpp_ca.crt
 TlsClientCertificateAuthent=true
 LogMaxEntriesCount=2000
+IncomingRequestsFromCpThreadPoolSize=10
 Iso15118PnCEnabled=true

examples/quick_start_centralsystem/config/quick_start_centralsystem.ini

@@ -16,4 +16,5 @@ TlsServerCertificatePrivateKeyPassphrase=
 TlsServerCertificateCa=../../examples/certificates/open-ocpp_ca.crt
 TlsClientCertificateAuthent=true
 LogMaxEntriesCount=2000
+IncomingRequestsFromCpThreadPoolSize=10
 Iso15118PnCEnabled=false

examples/quick_start_cs_lc_hybrid/HybridCentralSystemEventsHandler.cpp

@@ -37,10 +37,16 @@ HybridCentralSystemEventsHandler::HybridCentralSystemEventsHandler(LocalControll
                                                                    bool                   set_pending_status)
     : DefaultCentralSystemEventsHandler(iso_v2g_root_ca, iso_mo_root_ca, set_pending_status), m_config(config)
 {
+    // Start RPC pool
+    m_rpc_pool.start(config.incomingRequestsFromCsThreadPoolSize());
 }
 
 /** @brief Destructor */
-HybridCentralSystemEventsHandler::~HybridCentralSystemEventsHandler() { }
+HybridCentralSystemEventsHandler::~HybridCentralSystemEventsHandler()
+{
+    // Stop RPC pool
+    m_rpc_pool.stop();
+}
 
 // ICentralSystemEventsHandler interface
 
@@ -58,7 +64,7 @@ void HybridCentralSystemEventsHandler::chargePointConnected(std::shared_ptr<ocpp
             if (ocpp::helpers::endsWith(chargepoint->identifier(), "lc"))
             {
                 // Create Local Controller proxy
-                auto proxy = ocpp::localcontroller::IChargePointProxy::createFrom(chargepoint, m_config);
+                auto proxy = ocpp::localcontroller::IChargePointProxy::createFrom(chargepoint, m_config, m_rpc_pool);
 
                 // Open connection to the Central System
                 ocpp::websockets::IWebsocketClient::Credentials credentials;

examples/quick_start_cs_lc_hybrid/HybridCentralSystemEventsHandler.h

@@ -28,6 +28,7 @@ SOFTWARE.
 #include "DefaultCentralSystemEventsHandler.h"
 #include "IChargePointProxy.h"
 #include "LocalControllerConfig.h"
+#include "RpcPool.h"
 
 /** @brief Hybrid central system event handlers implementation for the examples */
 class HybridCentralSystemEventsHandler : public DefaultCentralSystemEventsHandler
@@ -92,6 +93,8 @@ class HybridCentralSystemEventsHandler : public DefaultCentralSystemEventsHandle
   private:
     /** @brief Configuration */
     LocalControllerConfig& m_config;
+    /** @brief RPC pool*/
+    ocpp::rpc::RpcPool m_rpc_pool;
     /** @brief Forwared charge points */
     std::map<std::string, std::shared_ptr<LocalControllerProxyEventsHandler>> m_fowarded_chargepoints;
 };

examples/quick_start_cs_lc_hybrid/config/quick_start_cs_lc_hybrid.ini

@@ -20,5 +20,7 @@ TlsClientCertificate=../../examples/certificates/open-ocpp_charge-point.crt
 TlsClientCertificatePrivateKey=../../examples/certificates/open-ocpp_charge-point.key
 TlsClientCertificatePrivateKeyPassphrase=
 LogMaxEntriesCount=2000
+IncomingRequestsFromCpThreadPoolSize=10
+IncomingRequestsFromCsThreadPoolSize=10
 DisconnectFromCpWhenCsDisconnected=true
 Iso15118PnCEnabled=false

examples/quick_start_localcontroller/config/quick_start_localcontroller.ini

@@ -18,4 +18,6 @@ TlsClientCertificate=../../examples/certificates/open-ocpp_charge-point.crt
 TlsClientCertificatePrivateKey=../../examples/certificates/open-ocpp_charge-point.key
 TlsClientCertificatePrivateKeyPassphrase=
 LogMaxEntriesCount=2000
+IncomingRequestsFromCpThreadPoolSize=10
+IncomingRequestsFromCsThreadPoolSize=10
 DisconnectFromCpWhenCsDisconnected=true

examples/security_centralsystem/config/security_centralsystem_p0.ini

@@ -16,4 +16,5 @@ TlsServerCertificatePrivateKeyPassphrase=
 TlsServerCertificateCa=
 TlsClientCertificateAuthent=false
 LogMaxEntriesCount=2000
+IncomingRequestsFromCpThreadPoolSize=5
 Iso15118PnCEnabled=false