(codegen): откорректировал шаблоны main и другие мелкие правки

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -84,7 +84,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( Exception&amp; ex )
+			catch( const Exception&amp; ex )
 			{
 				ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -83,7 +83,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( Exception&amp; ex )
+			catch( const Exception&amp; ex )
 			{
 				ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}

Utilities/codegen/ctl-cpp-cc.xsl

@@ -87,7 +87,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
 				ui->setValue(idHeartBeat,maxHeartBeat);
 				ptHeartBeat.reset();
 			}
-			catch( Exception&amp; ex )
+			catch( const Exception&amp; ex )
 			{
 				ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
 			}

Utilities/codegen/ctl-cpp-main-alone.xsl

@@ -40,11 +40,10 @@ using namespace UniSetTypes;
 // -----------------------------------------------------------------------------
 int main( int argc,char* argv[] )
 {
-	if( argc>1 && !strcmp(argv[1],"--help") )
+	if( argc>1 && ( strcmp(argv[1],"--help")==0 || strcmp(argv[1],"-h")==0 ) )
 	{
 		cout << "--name name		- ID процесса. По умолчанию IOController1." << endl;
 		cout << "--confile fname	- Конф. файл. по умолчанию configure.xml" << endl;
-		cout &lt;&lt; "--logfile fname	- выводить логи в файл fname. По умолчанию <xsl:value-of select="$CLASSNAME"/>.log"  &lt;&lt; endl;
 		return 0;
 	}
 
@@ -53,7 +52,7 @@ int main( int argc,char* argv[] )
 		auto conf = uniset_init(argc, argv);
 
 		// определяем ID объекта
-		ObjectId ID(DefaultObjectId);
+		ObjectId ID = DefaultObjectId;
 		string name = conf->getArgParam("--name","<xsl:value-of select="normalize-space($OID)"/>");
 		if( !name.empty() )
 			ID = conf->getObjectID(name);
@@ -66,19 +65,15 @@ int main( int argc,char* argv[] )
 			return 1;
 		}
 	
-		<xsl:value-of select="$CLASSNAME"/> obj(ID);
-
-		string logfilename = conf->getArgParam("--logfile","<xsl:value-of select="$CLASSNAME"/>.log");
-		string logname( conf->getLogDir() + logfilename );
-		obj.mylog->logFile( logname.c_str() );
+		auto obj = make_shared&lt;<xsl:value-of select="$CLASSNAME"/>&gt;(ID);
 
 		auto act = UniSetActivator::Instance();
-		act-&gt;add(obj.get_ptr());
+		act-&gt;add(obj);
 
 		SystemMessage sm(SystemMessage::StartUp);
 		act-&gt;broadcast( sm.transport_msg() );
 		act-&gt;run(false);
-		pause();	// пауза, чтобы дочерние потоки успели завершить работу
+		return 0;
 	}
 	catch( const Exception&amp; ex )
 	{
@@ -93,7 +88,7 @@ int main( int argc,char* argv[] )
 		cerr &lt;&lt; "(main): catch ..." &lt;&lt; endl;
 	}
 
-	return 0;
+	return 1;
 }
 </xsl:template>
 </xsl:stylesheet>

Utilities/codegen/ctl-cpp-main.xsl

@@ -42,11 +42,10 @@ using namespace UniSetTypes;
 // -----------------------------------------------------------------------------
 int main( int argc, const char** argv )
 {
-	if( argc>1 && strcmp(argv[1],"--help")==0 )
+	if( argc>1 && (strcmp(argv[1],"--help")==0 || strcmp(argv[1],"-h")==0) )
 	{
 		cout &lt;&lt; "--name name		- ID процесса. По умолчанию <xsl:value-of select="$CLASSNAME"/>." &lt;&lt; endl;
 		cout &lt;&lt; "--confile fname	- Конф. файл. по умолчанию configure.xml" &lt;&lt; endl;
-		cout &lt;&lt; "--logfile fname	- выводить логи в файл fname. По умолчанию <xsl:value-of select="$CLASSNAME"/>.log"  &lt;&lt; endl;
 		return 0;
 	}
 
@@ -58,7 +57,7 @@ int main( int argc, const char** argv )
 		</xsl:if>
 		<xsl:if test="normalize-space(//@OID)=''">
 		// определяем ID объекта
-		ObjectId ID(DefaultObjectId);
+		ObjectId ID = DefaultObjectId;
 		string name = conf->getArgParam("--name","<xsl:value-of select="$CLASSNAME"/>");
 		if( !name.empty() )
 		{
@@ -71,11 +70,8 @@ int main( int argc, const char** argv )
 				return 0;
 			}
 		}
-		auto obj = make_shared&lt;<xsl:value-of select="$CLASSNAME"/>&gt;(ID);
 
-		string logfilename = conf->getArgParam("--logfile","<xsl:value-of select="$CLASSNAME"/>.log");
-		string logname( conf->getLogDir() + logfilename );
-		obj->mylog->logFile( logname.c_str() );
+		auto obj = make_shared&lt;<xsl:value-of select="$CLASSNAME"/>&gt;(ID);
 		</xsl:if>
 
 		auto act = UniSetActivator::Instance();

Utilities/codegen/skel-main.cc

 #include <sstream>
+#include <memory>
 #include <UniSetActivator.h>
 #include "Skel.h"
 // -----------------------------------------------------------------------------
@@ -11,30 +12,27 @@ int main( int argc, const char** argv )
 	{
 		auto conf = uniset_init(argc, argv);
 
-		string logfilename = conf->getArgParam("--logfile", "Skel.log");
-		string logname( conf->getLogDir() + logfilename );
-		ulog.logFile( logname.c_str() );
-
-		auto act = UniSetActivator::Instance();
 		xmlNode* cnode = conf->getNode("Skel");
-
 		if( cnode == NULL )
 		{
-			dlog.crit() << "(Skel): not found <Skel> in conffile" << endl;
+			cerr << "(Skel): not found <Skel> in conffile" << endl;
 			return 1;
 		}
 
-		Skel o("Skel", cnode);
-		act.add(o.get_ptr());
+		auto o = make_shared<Skel>("Skel", cnode);
+
+		auto act = UniSetActivator::Instance();
+		act->add(o);
 
 		SystemMessage sm(SystemMessage::StartUp);
-		act.broadcast( sm.transport_msg() );
+		act->broadcast( sm.transport_msg() );
 
 		ulogany << "\n\n\n";
 		ulogany << "(Skel::main): -------------- Skel START -------------------------\n\n";
 		dlogany << "\n\n\n";
 		dlogany << "(Skel::main): -------------- Skel START -------------------------\n\n";
 		act->run(false);
+		return 0;
 	}
 	catch( const std::exception& ex )
 	{
@@ -45,6 +43,6 @@ int main( int argc, const char** argv )
 		cerr << "(Skel::main): catch(...)" << endl;
 	}
 
-	return 0;
+	return 1;
 }
 // -----------------------------------------------------------------------------

Utilities/codegen/skel.h

@@ -14,10 +14,10 @@ class Skel:
 	protected:
 		Skel();
 
-		virtual void step();
-		virtual void sensorInfo( UniSetTypes::SensorMessage* sm );
-		virtual void timerInfo( UniSetTypes::TimerMessage* tm );
-		virtual void askSensors( UniversalIO::UIOCommand cmd );
+		virtual void step() override;
+		virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override;
+		virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) override;
+		virtual void askSensors( UniversalIO::UIOCommand cmd ) override;
 
 	private:
 };

Utilities/codegen/tests/TestGen.cc

@@ -27,6 +27,7 @@ void TestGen::step()
 	cout << dumpIO() << endl;
 
 	myinfo << str(input2_s) << endl;
+	ulog()->info() << "ulog: " << str(input2_s) << endl;
 }
 // -----------------------------------------------------------------------------
 void TestGen::sensorInfo( const SensorMessage* sm )

Utilities/codegen/tests/start_fg.sh

@@ -2,8 +2,9 @@
 
 ulimit -Sc 1000000
 
-uniset2-start.sh -f ./test --name TestProc --confile test.xml --ulog-add-levels info,crit,warn,level1,level8 \
+uniset2-start.sh -f ./test --name TestProc --confile test.xml --ulog-add-levels warn,crit \
 --sm-ready-timeout 5000 --test-run-logserver --test-log-add-levels any
+
 #info,warn,crit,system,level9 > 1.log
 #--c-filter-field cfilter --c-filter-value test1 --s-filter-field io --s-filter-value 1
 

conf/test.xml

@@ -53,6 +53,9 @@
 			t_check_s="Threshold1_S"
 			log_c="LogLevel_S"
 			log_s="LogLevel_S"
+			input1_s="Input5_S"
+			input2_s="Input6_S"
+			output2_c="DO2_C"
 		/>
 
 		<IOControl name="IOControl"/>