Skip to content

U
uniset2
Commit 12cfee59 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Почистил от warning-ов генератор кода (codegen)

parent 2c2319d4
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 49 deletions
TODO
View file @ 12cfee59
......@@ -32,3 +32,8 @@
----------
smonit: processing "precision"
admin: processing "precision"
codegen:
- Сделать работу с TestMode на основе заказа!
- Сделать работу с ResetMsg на основе askTimer! (подумать нужно ли..)
\ No newline at end of file
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @ 12cfee59
......@@ -32,7 +32,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
return;
try
{
#warning Сделать работу с TestMode на основе заказа!
isTestMode = checkTestMode();
if( trTestMode.change(isTestMode) )
testMode(isTestMode);
......@@ -49,7 +48,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
// проверка таймеров
checkTimers(this);
#warning Сделать работу с ResetMsg на основе askTimer!
if( resetMsgTime&gt;0 &amp;&amp; trResetMsg.hi(ptResetMsg.checkTime()) )
{
// cout &lt;&lt; myname &lt;&lt; ": ********* reset messages *********" &lt;&lt; endl;
......@@ -165,8 +163,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(askSensors): catch(...)" &lt;&lt; endl;
}
#warning Сделать паузу между заказами настраиваемой из конф. файла
msleep(2000);
msleep(askPause);
}
}
// -----------------------------------------------------------------------------
......
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @ 12cfee59
......@@ -127,24 +127,20 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::preSensorInfo( UniSetTypes::SensorM
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askState( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
{
// #warning НЕ РЕАЛИЗОВАНА...
if( _cmd == UniversalIO::UIONotify )
{
SensorMessage _sm( _sid, (bool)ui.getState(_sid,_node) );
_sm.node = _node;
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _sid, UniversalIO::UIOCommand _cmd, UniSetTypes::ObjectId _node )
{
// #warning НЕ РЕАЛИЗОВАНА..
if( _cmd == UniversalIO::UIONotify )
{
SensorMessage _sm( _sid, (long)ui.getValue(_sid,_node) );
_sm.node = _node;
// push( _sm.transport_msg() );
sensorInfo(&amp;_sm);
}
}
......
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @ 12cfee59
......@@ -33,7 +33,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
return;
try
{
#warning Сделать работу с TestMode на основе заказа!
isTestMode = checkTestMode();
if( trTestMode.change(isTestMode) )
testMode(isTestMode);
......@@ -50,7 +49,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::callback()
// проверка таймеров
checkTimers(this);
#warning Сделать работу с ResetMsg на основе askTimer!
if( resetMsgTime&gt;0 &amp;&amp; trResetMsg.hi(ptResetMsg.checkTime()) )
{
// cout &lt;&lt; myname &lt;&lt; ": ********* reset messages *********" &lt;&lt; endl;
......@@ -253,8 +251,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand
{
unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(askSensors): catch(...)" &lt;&lt; endl;
}
#warning Сделать паузу между заказами настраиваемой из конф. файла
msleep(2000);
msleep(askPause);
}
}
// -----------------------------------------------------------------------------
......
Utilities/codegen/ctl-cpp-cc.xsl
View file @ 12cfee59
......@@ -159,24 +159,20 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askSensors( UniversalIO::UIOCommand
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askState( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand cmd, UniSetTypes::ObjectId node )
{
// #warning НЕ РЕАЛИЗОВАНА...
if( cmd == UniversalIO::UIONotify )
{
SensorMessage sm( sid, (bool)ui.getState(sid,node) );
sm.node = node;
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
}
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand cmd, UniSetTypes::ObjectId node )
{
// #warning НЕ РЕАЛИЗОВАНА..
if( cmd == UniversalIO::UIONotify )
{
SensorMessage sm( sid, (long)ui.getValue(sid,node) );
sm.node = node;
// push( sm.transport_msg() );
sensorInfo(&amp;sm);
}
}
......
Utilities/codegen/ctl-cpp-common.xsl
View file @ 12cfee59
......@@ -170,11 +170,6 @@
void setState( UniSetTypes::ObjectId sid, bool state );
void askState( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::conf->getLocalNode() );
void askValue( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::conf->getLocalNode() );
void askThreshold ( UniSetTypes::ObjectId sensorId, UniSetTypes::ThresholdId tid,
UniversalIO::UIOCommand cmd,
CORBA::Long lowLimit, CORBA::Long hiLimit, CORBA::Long sensibility,
UniSetTypes::ObjectId backid = UniSetTypes::DefaultObjectId );
void updateValues();
void setMsg( UniSetTypes::ObjectId code, bool state );
</xsl:template>
......@@ -229,6 +224,7 @@
bool activated;
int activateTimeout; /*!&lt; время ожидания готовности UniSetObject к работе */
PassiveTimer ptStartUpTimeout; /*!&lt; время на блокировку обработки WatchDog, если недавно был StartUp */
int askPause; /*!&lt; пауза между неудачными попытками заказать датчики */
</xsl:template>
<xsl:template name="COMMON-HEAD-PRIVATE">
......@@ -328,7 +324,6 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::sysCommand( SystemMessage* _sm )
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::setState( UniSetTypes::ObjectId _sid, bool _state )
{
#warning сделать setState отдельной функцией, а не через setValue
setValue(_sid, _state ? 1 : 0 );
}
// -----------------------------------------------------------------------------
......@@ -359,15 +354,6 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::activateObject()
return true;
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::askThreshold( UniSetTypes::ObjectId _sid, UniSetTypes::ThresholdId _tid,
UniversalIO::UIOCommand _cmd,
CORBA::Long lowLimit, CORBA::Long _hiLimit, CORBA::Long _sensibility,
UniSetTypes::ObjectId _backid )
{
#warning askThreshold НЕ РЕАЛИЗОВАНА...
// ui.askThreshold( _sid,_tid,_cmd,_lowLimit,_hiLimit,_sensibility,_backid);
}
// -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::preTimerInfo( UniSetTypes::TimerMessage* _tm )
{
timerInfo(_tm);
......@@ -479,7 +465,8 @@ idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(0),
smReadyTimeout(0),
activated(false)
activated(false),
askPause(2000)
{
unideb[Debug::CRIT] &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
throw Exception( string(myname+": init failed!!!") );
......@@ -508,7 +495,8 @@ idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(cnode),
smReadyTimeout(0),
activated(false)
activated(false),
askPause(conf->getPIntProp(cnode,"askPause",2000))
{
<xsl:call-template name="COMMON-ID-LIST"/>
......@@ -736,7 +724,8 @@ idLocalTestMode_S(DefaultObjectId),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(0),
activated(false)
activated(false),
askPause(2000)
{
unideb[Debug::CRIT] &lt;&lt; "<xsl:value-of select="$CLASSNAME"/>: init failed!!!!!!!!!!!!!!!" &lt;&lt; endl;
throw Exception( string(myname+": init failed!!!") );
......@@ -767,7 +756,8 @@ in_LocalTestMode_S(false),
idHeartBeat(DefaultObjectId),
maxHeartBeat(10),
confnode(cnode),
activated(false)
activated(false),
askPause(conf->getPIntProp(cnode,"askPause",2000))
{
si.node = conf->getLocalNode();
......
Utilities/codegen/ctl-cpp-h-alone.xsl
View file @ 12cfee59
......@@ -52,6 +52,7 @@ class <xsl:value-of select="$CLASSNAME"/>_SK:
<xsl:value-of select="$CLASSNAME"/>_SK( UniSetTypes::ObjectId id, xmlNode* node=UniSetTypes::conf->getNode("<xsl:value-of select="normalize-space($OID)"/>") );
</xsl:if>
<xsl:value-of select="$CLASSNAME"/>_SK();
virtual ~<xsl:value-of select="$CLASSNAME"/>_SK();
<xsl:call-template name="COMMON-HEAD-PUBLIC"/>
......
Utilities/codegen/tests/Makefile.am
View file @ 12cfee59
noinst_PROGRAMS = test
noinst_PROGRAMS = test test2
#test2
test_LDADD = $(top_builddir)/lib/libUniSet.la
test_CXXFLAGS = -I$(top_builddir)/include
test_SOURCES = TestGen_SK.cc TestGen.cc TestGen-main.cc
#test2_LDADD = $(top_builddir)/lib/libUniSet.la
#test2_CXXFLAGS = -I$(top_builddir)/include
#test2_SOURCES = TestGenAlone_SK.cc TestGenAlone.cc TestGenAlone-main.cc
test2_LDADD = $(top_builddir)/lib/libUniSet.la
test2_CXXFLAGS = -I$(top_builddir)/include
test2_SOURCES = TestGenAlone_SK.cc TestGenAlone.cc TestGenAlone-main.cc
GENERATED=TestGen_SK.h TestGen_SK.cc TestGen-main.cc
GENERATED2=TestGenAlone_SK.h TestGenAlone_SK.cc TestGenAlone-main.cc
......
Utilities/codegen/tests/TestGenAlone.cc
View file @ 12cfee59
......@@ -13,12 +13,6 @@ TestGenAlone::~TestGenAlone()
{
}
// -----------------------------------------------------------------------------
TestGenAlone::TestGenAlone()
{
cerr << ": init failed!!!!!!!!!!!!!!!"<< endl;
throw Exception();
}
// -----------------------------------------------------------------------------
void TestGenAlone::step()
{
cout << "input2 state=" << in_input2_s << endl;
......
Utilities/codegen/tests/TestGenAlone.h
View file @ 12cfee59
......@@ -14,8 +14,6 @@ class TestGenAlone:
protected:
TestGenAlone();
virtual void step();
void sensorInfo( UniSetTypes::SensorMessage *sm );
void timerInfo( UniSetTypes::TimerMessage *tm );
......
Utilities/codegen/tests/testgen-alone.src.xml
View file @ 12cfee59
......@@ -13,7 +13,7 @@
<GlobalConfigure>
<settings>
<TestGenAlone>
<TestGenAlone name="TestGenAlone">
<set name="ID" val="TestGenAlone"/>
<set name="class-name" val="TestGenAlone"/>
<set name="msg-count" val="20"/>
......
conf/libuniset.spec
View file @ 12cfee59
......@@ -3,7 +3,7 @@
Name: libuniset
Version: 0.99
Release: eter20
Release: eter21
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
......@@ -184,6 +184,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Tue Nov 23 2010 Pavel Vainerman <pv@altlinux.ru> 0.99-eter20
- new build
* Tue Nov 16 2010 Pavel Vainerman <pv@etersoft.ru> 0.99-eter17
- fixed bug in MBSlave
......
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