(IOController): direct use DBServer (optimization)

extensions/Backend-OpenTSDB/libUniSet2BackendOpenTSDB.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libUniSet2BackendOpenTSDB
 Description: Support library for UniSet2BackendOpenTSDB
-Requires: libUniSet2Extensions
+Requires: libUniSet2Extensions libUniSet2SharedMemory
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2BackendOpenTSDB
 Cflags: -I${includedir}/@PACKAGE@/extensions

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc

@@ -531,7 +531,7 @@ string DBServer_PostgreSQL::getMonitInfo( const string& params )
 }
 //--------------------------------------------------------------------------------------------
 std::shared_ptr<DBServer_PostgreSQL> DBServer_PostgreSQL::init_dbserver( int argc, const char* const* argv,
-        const std::string& prefix )
+    const std::shared_ptr<uniset::SharedMemory>& shm, const std::string& prefix )
 {
     auto conf = uniset_conf();
 
@@ -551,7 +551,10 @@ std::shared_ptr<DBServer_PostgreSQL> DBServer_PostgreSQL::init_dbserver( int arg
     }
 
     uinfo << "(DBServer_PostgreSQL): name = " << name << "(" << ID << ")" << endl;
-    return make_shared<DBServer_PostgreSQL>(ID, prefix);
+    auto db = make_shared<DBServer_PostgreSQL>(ID, prefix);
+    if( shm )
+        shm->setDBServer(db);
+    return db;
 }
 // -----------------------------------------------------------------------------
 void DBServer_PostgreSQL::help_print( int argc, const char* const* argv )

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.h

@@ -23,6 +23,7 @@
 #include "UniSetTypes.h"
 #include "PostgreSQLInterface.h"
 #include "DBServer.h"
+#include "SharedMemory.h"
 // -------------------------------------------------------------------------
 namespace uniset
 {
@@ -61,7 +62,7 @@ namespace uniset
             virtual ~DBServer_PostgreSQL();
 
             /*! глобальная функция для инициализации объекта */
-            static std::shared_ptr<DBServer_PostgreSQL> init_dbserver( int argc, const char* const* argv, const std::string& prefix = "pgsql" );
+            static std::shared_ptr<DBServer_PostgreSQL> init_dbserver( int argc, const char* const* argv, const std::shared_ptr<uniset::SharedMemory>& ic = nullptr, const std::string& prefix = "pgsql" );
 
             /*! глобальная функция для вывода help-а */
             static void help_print( int argc, const char* const* argv );

extensions/DBServer-PostgreSQL/Makefile.am

@@ -4,17 +4,17 @@ UPGSQL_VER=@LIBVER@
 lib_LTLIBRARIES              = libUniSet2-pgsql.la
 libUniSet2_pgsql_la_LDFLAGS  = -version-info $(UPGSQL_VER)
 libUniSet2_pgsql_la_SOURCES  = PostgreSQLInterface.cc DBServer_PostgreSQL.cc
-libUniSet2_pgsql_la_LIBADD   = $(top_builddir)/lib/libUniSet2.la $(PGSQL_LIBS)
-libUniSet2_pgsql_la_CXXFLAGS = -std=c++17 $(PGSQL_CFLAGS)
+libUniSet2_pgsql_la_LIBADD   = $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(PGSQL_LIBS)
+libUniSet2_pgsql_la_CXXFLAGS = -std=c++17 -I$(top_builddir)/extensions/SharedMemory $(PGSQL_CFLAGS)
 
 bin_PROGRAMS                      = @PACKAGE@-pgsql-dbserver
-@PACKAGE@_pgsql_dbserver_LDADD    = libUniSet2-pgsql.la $(top_builddir)/lib/libUniSet2.la $(PGSQL_LIBS)
-@PACKAGE@_pgsql_dbserver_CXXFLAGS = -std=c++17 $(PGSQL_CFLAGS)
+@PACKAGE@_pgsql_dbserver_LDADD    = libUniSet2-pgsql.la $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(PGSQL_LIBS)
+@PACKAGE@_pgsql_dbserver_CXXFLAGS = -std=c++17 -I$(top_builddir)/extensions/SharedMemory $(PGSQL_CFLAGS)
 @PACKAGE@_pgsql_dbserver_SOURCES  = main.cc
 
 noinst_PROGRAMS     = pgsql-test
-pgsql_test_LDADD    = libUniSet2-pgsql.la $(top_builddir)/lib/libUniSet2.la $(PGSQL_LIBS)
-pgsql_test_CXXFLAGS = -std=c++17 $(PGSQL_CFLAGS)
+pgsql_test_LDADD    = libUniSet2-pgsql.la $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la $(PGSQL_LIBS)
+pgsql_test_CXXFLAGS = -std=c++17 -I$(top_builddir)/extensions/SharedMemory $(PGSQL_CFLAGS)
 pgsql_test_SOURCES  = test.cc
 
 # install

extensions/DBServer-PostgreSQL/libUniSet2PostgreSQL.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: libUniSet2PostgreSQL
 Description: Support library for libUniSet2PostgreSQL
-Requires: libUniSet2 libpqxx
+Requires: libUniSet2 libpqxx libUniSet2SharedMemory
 Version: @VERSION@
 Libs: -L${libdir} -lUniSet2-pgsql
 Cflags: -std=c++17 -I${includedir}/@PACKAGE@ -I${includedir}/@PACKAGE@/extensions/pgsql

include/IOController.h

@@ -31,6 +31,7 @@
 #include "UniSetManager.h"
 #include "Configuration.h"
 #include "Mutex.h"
+#include "DBServer.h"
 //---------------------------------------------------------------------------
 namespace uniset
 {
@@ -41,7 +42,7 @@ namespace uniset
      * Поэтому неизменность ioList во время всей жизни объекта должна гарантироваться.
      * В частности, очень важной является структура USensorInfo, а также userdata,
      * которые используются для "кэширования" (сохранения) указателей на специальные данные.
-     * (см. также IONotifyContoller).
+     * (см. также IONotifyController).
     */
     class IOController:
         public UniSetManager,
@@ -53,6 +54,8 @@ namespace uniset
             IOController( const uniset::ObjectId id );
             virtual ~IOController();
 
+            void setDBServer( const std::shared_ptr<uniset::DBServer>& dbserver );
+
             virtual uniset::ObjectType getType() override
             {
                 return uniset::ObjectType("IOController");
@@ -293,6 +296,7 @@ namespace uniset
 
             bool isPingDBServer;    // флаг связи с DBServer-ом
             uniset::ObjectId dbserverID = { uniset::DefaultObjectId };
+            std::shared_ptr<uniset::DBServer> dbserver = { nullptr };
 
             std::mutex loggingMutex; /*!< logging info mutex */
 

src/Processes/IOController.cc

@@ -493,12 +493,25 @@ void IOController::ioUnRegistration( const uniset::ObjectId sid )
 	ui->unregister(sid);
 }
 // ---------------------------------------------------------------------------
+void IOController::setDBServer( const std::shared_ptr<DBServer>& db )
+{
+    dbserver = db;
+}
+// ---------------------------------------------------------------------------
 void IOController::logging( uniset::SensorMessage& sm )
 {
-	std::lock_guard<std::mutex> l(loggingMutex);
+    std::lock_guard<std::mutex> l(loggingMutex);
+
+    try
+    {
+		if( dbserver )
+		{
+		    sm.consumer = dbserverID;
+		    dbserver->push(sm.transport_msg());
+		    isPingDBServer = true;
+		    return;
+		}
 
-	try
-	{
 		// значит на этом узле нет DBServer-а
 		if( dbserverID == uniset::DefaultObjectId )
 		{