(2.0): Небольшая оптимизация работы NCRestorer_XML, сдела так, что если заданный…

extensions/tests/SMemoryTest/start_fg.sh

@@ -2,7 +2,7 @@
 
 START=uniset-start.sh
 
-${START} -f ./smemory-test --confile test.xml --dlog-add-levels level1 --localNode LocalhostNode $*
+${START} -f ./smemory-test --confile ./test.xml --dlog-add-levels level1 --localNode LocalhostNode $*
 
 #--unideb-add-levels crit,warn,info
 

extensions/tests/SMemoryTest/start_fg_vcall.sh

+#!/bin/sh
+
+START=uniset-start.sh
+
+${START} -vcall ./.libs/lt-smemory-test --confile test.xml --dlog-add-levels level1 --localNode LocalhostNode $*
+
+#--unideb-add-levels crit,warn,info
+
+#system,level2,level8,level9

include/NCRestorer.h

@@ -175,7 +175,7 @@ class NCRestorer_XML:
 		std::string t_filterValue;
 
 		std::string fname;
-		UniXML uxml;
+        UniXML* uxml;
 		ReaderSlot rtslot;
 		NCReaderSlot ncrslot;
 

src/Processes/NCRestorer_XML.cc

@@ -53,21 +53,27 @@ c_filterField(""),
 c_filterValue(""),
 t_filterField(""),
 t_filterValue(""),
-fname(fname)
+fname(fname),
+uxml(0)
 {
 	init(fname);
 	setItemFilter(f_field,f_value);
 }
 
 NCRestorer_XML::NCRestorer_XML():
-fname("")
+fname(""),
+uxml(0)
 {
 }
 
 // ------------------------------------------------------------------------------------------
 NCRestorer_XML::~NCRestorer_XML()
 {
-	uxml.close();
+    if( uxml)
+    {
+        uxml->close();
+        delete uxml;
+    }
 }
 // ------------------------------------------------------------------------------------------
 void NCRestorer_XML::init( const std::string& fname )
@@ -78,7 +84,10 @@ void NCRestorer_XML::init( const std::string& fname )
 	*/
 	try
 	{
-		uxml.open(fname);
+        if( fname == conf->getConfFileName() )
+            uxml = conf->getConfXML();
+        else
+            uxml = new UniXML(fname);
 	}
 	catch(UniSetTypes::NameNotFound& ex)
 	{
@@ -175,11 +184,13 @@ void NCRestorer_XML::read( IONotifyController* ic, const string& fn )
 		// оптимизация (не загружаем второй раз xml-файл)
 		if( fname == conf->getConfFileName() && confxml )
 			read( ic, *confxml );
-		else
+        else if( uxml && uxml->isOpen() && uxml->filename == fn )
+            read(ic,*uxml);
+        else
 		{
-			uxml.close();
-			uxml.open(fname);
-			read(ic,uxml);
+            uxml->close();
+            uxml->open(fname);
+            read(ic,*uxml);
 		}
 	}
 }

src/Various/Restorer_XML.cc

@@ -42,6 +42,7 @@ c_filterValue("")
 // -----------------------------------------------------------------------------
 Restorer_XML::~Restorer_XML()
 {
+
 }
 // -----------------------------------------------------------------------------
 void Restorer_XML::setItemFilter( const string field, const string val )