Skip to content

U
uniset2
Commit 279a3509 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(codegen): исправил ошибку: waitReady --> waitWorking,

а так же мелкие правки (ucrit --> mycrit и т.п.)
parent 702c5ece
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 53 deletions
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @ 279a3509
...@@ -86,7 +86,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -86,7 +86,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
} }
...@@ -96,16 +96,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -96,16 +96,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const CORBA::SystemException&amp; ex ) catch( const CORBA::SystemException&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: " mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl; &lt;&lt; ex.NP_minorString() &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
if( !active ) if( !active )
...@@ -189,7 +189,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -189,7 +189,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
if( !activated ) if( !activated )
ucrit &lt;&lt; myname mycrit &lt;&lt; myname
&lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl; &lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl;
for( ;; ) for( ;; )
...@@ -207,11 +207,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -207,11 +207,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
msleep(askPause); msleep(askPause);
} }
...@@ -268,7 +268,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si ...@@ -268,7 +268,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
} }
...@@ -322,7 +322,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force ) ...@@ -322,7 +322,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -357,7 +357,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force ) ...@@ -357,7 +357,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -372,7 +372,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force ) ...@@ -372,7 +372,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
......
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @ 279a3509
...@@ -89,7 +89,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -89,7 +89,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
} }
...@@ -101,16 +101,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -101,16 +101,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const CORBA::SystemException&amp; ex) catch( const CORBA::SystemException&amp; ex)
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: " mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl; &lt;&lt; ex.NP_minorString() &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
if( !active ) if( !active )
...@@ -260,7 +260,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID() ...@@ -260,7 +260,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -295,7 +295,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID() ...@@ -295,7 +295,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -310,7 +310,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID() ...@@ -310,7 +310,7 @@ UniSetTypes::ObjectId <xsl:value-of select="$CLASSNAME"/>_SK::getSMTestID()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
......
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @ 279a3509
...@@ -85,7 +85,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -85,7 +85,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
} }
...@@ -95,16 +95,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -95,16 +95,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const CORBA::SystemException&amp; ex ) catch( const CORBA::SystemException&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: " mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl; &lt;&lt; ex.NP_minorString() &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
if( !active ) if( !active )
...@@ -221,7 +221,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si ...@@ -221,7 +221,7 @@ long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _si
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getValue): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
} }
...@@ -239,7 +239,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -239,7 +239,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
if( !activated ) if( !activated )
ucrit &lt;&lt; myname mycrit &lt;&lt; myname
&lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl; &lt;&lt; "(preAskSensors): ************* don`t activated?! ************" &lt;&lt; endl;
for( ;; ) for( ;; )
...@@ -256,11 +256,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -256,11 +256,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(preAskSensors): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
msleep(askPause); msleep(askPause);
...@@ -280,7 +280,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -280,7 +280,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
catch( UniSetTypes::Exception&amp; ex ) catch( UniSetTypes::Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
} }
...@@ -297,7 +297,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -297,7 +297,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
catch( UniSetTypes::Exception&amp; ex ) catch( UniSetTypes::Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
} }
...@@ -315,7 +315,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm ...@@ -315,7 +315,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preAskSensors( UniversalIO::UIOComm
} }
catch( UniSetTypes::Exception&amp; ex ) catch( UniSetTypes::Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
} }
......
Utilities/codegen/ctl-cpp-cc.xsl
View file @ 279a3509
...@@ -89,7 +89,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -89,7 +89,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
} }
...@@ -99,16 +99,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback() ...@@ -99,16 +99,16 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): " &lt;&lt; ex &lt;&lt; endl;
} }
catch( const CORBA::SystemException&amp; ex ) catch( const CORBA::SystemException&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: " mycrit &lt;&lt; myname &lt;&lt; "(execute): СORBA::SystemException: "
&lt;&lt; ex.NP_minorString() &lt;&lt; endl; &lt;&lt; ex.NP_minorString() &lt;&lt; endl;
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
if( !active ) if( !active )
...@@ -222,7 +222,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM() ...@@ -222,7 +222,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(getdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -239,7 +239,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM() ...@@ -239,7 +239,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -257,7 +257,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM() ...@@ -257,7 +257,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setdata): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
...@@ -274,7 +274,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM() ...@@ -274,7 +274,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::initFromSM()
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(setmsg): " &lt;&lt; ex &lt;&lt; endl;
throw; throw;
} }
</xsl:template> </xsl:template>
......
Utilities/codegen/ctl-cpp-common.xsl
View file @ 279a3509
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</xsl:when> </xsl:when>
<xsl:when test="$GENTYPE='CHECK'"> <xsl:when test="$GENTYPE='CHECK'">
<xsl:if test="normalize-space(@no_check_id)!='1'"> <xsl:if test="normalize-space(@no_check_id)!='1'">
<xsl:if test="normalize-space(../../@id)=''">uwarn &lt;&lt; myname &lt;&lt; ": Not found (Message)OID for mid_<xsl:value-of select="normalize-space(../../@name)"/>" &lt;&lt; endl; <xsl:if test="normalize-space(../../@id)=''">mywarn &lt;&lt; myname &lt;&lt; ": Not found (Message)OID for mid_<xsl:value-of select="normalize-space(../../@name)"/>" &lt;&lt; endl;
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>
</xsl:when> </xsl:when>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(execute): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
return false; return false;
} }
...@@ -375,7 +375,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::Voi ...@@ -375,7 +375,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::Voi
} }
catch( const Exception&amp; ex ) catch( const Exception&amp; ex )
{ {
ucrit &lt;&lt; myname &lt;&lt; "(processingMessage): " &lt;&lt; ex &lt;&lt; endl; mycrit &lt;&lt; myname &lt;&lt; "(processingMessage): " &lt;&lt; ex &lt;&lt; endl;
} }
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -384,10 +384,10 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preSysCommand( const SystemMessage* ...@@ -384,10 +384,10 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preSysCommand( const SystemMessage*
switch( _sm->command ) switch( _sm->command )
{ {
case SystemMessage::WatchDog: case SystemMessage::WatchDog:
uinfo &lt;&lt; myname &lt;&lt; "(preSysCommand): WatchDog" &lt;&lt; endl; myinfo &lt;&lt; myname &lt;&lt; "(preSysCommand): WatchDog" &lt;&lt; endl;
if( !active || !ptStartUpTimeout.checkTime() ) if( !active || !ptStartUpTimeout.checkTime() )
{ {
uwarn &lt;&lt; myname &lt;&lt; "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" &lt;&lt; endl; mywarn &lt;&lt; myname &lt;&lt; "(preSysCommand): игнорируем WatchDog, потому-что только-что стартанули" &lt;&lt; endl;
break; break;
} }
case SystemMessage::StartUp: case SystemMessage::StartUp:
...@@ -528,18 +528,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te ...@@ -528,18 +528,18 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
if( _testID == DefaultObjectId ) if( _testID == DefaultObjectId )
return; return;
uinfo &lt;&lt; myname &lt;&lt; "(waitSM): waiting SM ready " myinfo &lt;&lt; myname &lt;&lt; "(waitSM): waiting SM ready "
&lt;&lt; wait_msec &lt;&lt; " msec" &lt;&lt; wait_msec &lt;&lt; " msec"
&lt;&lt; " testID=" &lt;&lt; _testID &lt;&lt; endl; &lt;&lt; " testID=" &lt;&lt; _testID &lt;&lt; endl;
if( !ui->waitReady(_testID,wait_msec) ) if( !ui->waitWorking(_testID,wait_msec) )
{ {
ostringstream err; ostringstream err;
err &lt;&lt; myname err &lt;&lt; myname
&lt;&lt; "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение " &lt;&lt; "(waitSM): Не дождались готовности(exist) SharedMemory к работе в течение "
&lt;&lt; wait_msec &lt;&lt; " мсек"; &lt;&lt; wait_msec &lt;&lt; " мсек";
ucrit &lt;&lt; err.str() &lt;&lt; endl; mycrit &lt;&lt; err.str() &lt;&lt; endl;
// terminate(); // terminate();
// abort(); // abort();
raise(SIGTERM); raise(SIGTERM);
...@@ -557,7 +557,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te ...@@ -557,7 +557,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
&lt;&lt; "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение " &lt;&lt; "(waitSM): Не дождались готовности(work) SharedMemory к работе в течение "
&lt;&lt; wait_msec &lt;&lt; " мсек"; &lt;&lt; wait_msec &lt;&lt; " мсек";
ucrit &lt;&lt; err.str() &lt;&lt; endl; mycrit &lt;&lt; err.str() &lt;&lt; endl;
// terminate(); // terminate();
// abort(); // abort();
raise(SIGTERM); raise(SIGTERM);
...@@ -706,7 +706,7 @@ forceOut(false), ...@@ -706,7 +706,7 @@ forceOut(false),
</xsl:for-each> </xsl:for-each>
end_private(false) end_private(false)
{ {
ucrit &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl; mycrit &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
throw Exception( string(myname+": init failed!!!") ); throw Exception( string(myname+": init failed!!!") );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -931,14 +931,14 @@ end_private(false) ...@@ -931,14 +931,14 @@ end_private(false)
<xsl:if test="normalize-space(@min)!=''"> <xsl:if test="normalize-space(@min)!=''">
if( <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/> ) if( <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/> )
{ {
uwarn &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &lt; <xsl:value-of select="@min"/>" &lt;&lt; endl; mywarn &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &lt; <xsl:value-of select="@min"/>" &lt;&lt; endl;
<xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/>");</xsl:if> <xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &lt; <xsl:value-of select="@min"/>");</xsl:if>
} }
</xsl:if> </xsl:if>
<xsl:if test="normalize-space(@max)!=''"> <xsl:if test="normalize-space(@max)!=''">
if( <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/> ) if( <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/> )
{ {
uwarn &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &gt; <xsl:value-of select="@max"/>" &lt;&lt; endl; mywarn &lt;&lt; myname &lt;&lt; ": RANGE WARNING: <xsl:value-of select="@name"/>=" &lt;&lt; <xsl:value-of select="@name"/> &lt;&lt; " &gt; <xsl:value-of select="@max"/>" &lt;&lt; endl;
<xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/>");</xsl:if> <xsl:if test="normalize-space(@no_range_exception)=''">throw UniSetTypes::SystemError(myname+"(init): <xsl:value-of select="@name"/> &gt; <xsl:value-of select="@max"/>");</xsl:if>
} }
</xsl:if> </xsl:if>
......
Utilities/codegen/ctl-cpp-main-alone.xsl
View file @ 279a3509
...@@ -81,7 +81,7 @@ int main( int argc,char* argv[] ) ...@@ -81,7 +81,7 @@ int main( int argc,char* argv[] )
} }
catch( const std::exception&amp;ex ) catch( const std::exception&amp;ex )
{ {
ucrit &lt;&lt; "(main): catch " &lt;&lt; ex.what() &lt;&lt; endl; cerr &lt;&lt; "(main): catch " &lt;&lt; ex.what() &lt;&lt; endl;
} }
catch(...) catch(...)
{ {
......
conf/libuniset2.spec
View file @ 279a3509
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.2 Version: 2.2
Release: alt24 Release: alt25
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -451,6 +451,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -451,6 +451,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# .. # ..
%changelog %changelog
* Fri Feb 19 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt25
- (codegen): fixed bug (waitReady --> waitWorking)
* Thu Feb 18 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt24 * Thu Feb 18 2016 Pavel Vainerman <pv@altlinux.ru> 2.2-alt24
- modbustcpserver-echo: fixed bug for options - modbustcpserver-echo: fixed bug for options
- ModbusTCPMultiMaster: add new logs, - ModbusTCPMultiMaster: add new logs,
......
extensions/SharedMemory/tests/TestObject.cc
View file @ 279a3509
...@@ -7,6 +7,7 @@ using namespace UniSetTypes; ...@@ -7,6 +7,7 @@ using namespace UniSetTypes;
TestObject::TestObject( UniSetTypes::ObjectId objId, xmlNode* cnode ): TestObject::TestObject( UniSetTypes::ObjectId objId, xmlNode* cnode ):
TestObject_SK(objId, cnode) TestObject_SK(objId, cnode)
{ {
vmonit(evntIsOK);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
TestObject::~TestObject() TestObject::~TestObject()
......
extensions/SharedMemory/tests/tests.sh
View file @ 279a3509
...@@ -9,4 +9,5 @@ ...@@ -9,4 +9,5 @@
./uniset2-start.sh -f ./tests $* -- --confile ./sm-configure.xml --pulsar-id Pulsar_S --pulsar-msec 1000 --e-filter evnt_test \ ./uniset2-start.sh -f ./tests $* -- --confile ./sm-configure.xml --pulsar-id Pulsar_S --pulsar-msec 1000 --e-filter evnt_test \
--heartbeat-node localhost --heartbeat-check-time 1000 --heartbeat-node localhost --heartbeat-check-time 1000
#--sm-log-add-levels any --TestObject-log-add-levels any
#--dlog-add-levels any #--dlog-add-levels any
include/UInterface.h
View file @ 279a3509
...@@ -189,11 +189,13 @@ class UInterface ...@@ -189,11 +189,13 @@ class UInterface
bool isExist( const UniSetTypes::ObjectId id ) const; bool isExist( const UniSetTypes::ObjectId id ) const;
bool isExist( const UniSetTypes::ObjectId id, const UniSetTypes::ObjectId node ) const; bool isExist( const UniSetTypes::ObjectId id, const UniSetTypes::ObjectId node ) const;
// used for check 'isExist'
bool waitReady( const UniSetTypes::ObjectId id, int msec, int pause = 5000, bool waitReady( const UniSetTypes::ObjectId id, int msec, int pause = 5000,
const UniSetTypes::ObjectId node = UniSetTypes::uniset_conf()->getLocalNode() ); // used exist const UniSetTypes::ObjectId node = UniSetTypes::uniset_conf()->getLocalNode() );
// used for check 'getValue'
bool waitWorking( const UniSetTypes::ObjectId id, int msec, int pause = 3000, bool waitWorking( const UniSetTypes::ObjectId id, int msec, int pause = 3000,
const UniSetTypes::ObjectId node = UniSetTypes::uniset_conf()->getLocalNode() ); // used getValue const UniSetTypes::ObjectId node = UniSetTypes::uniset_conf()->getLocalNode() );
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Работа с ID, Name // Работа с ID, Name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment