Skip to content

U
uniset2
Commit 89ba4e3b authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

Корректировка processingMessage()

parent 918110b0
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 30 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ 89ba4e3b
......@@ -254,7 +254,7 @@
<xsl:template name="COMMON-HEAD-PROTECTED">
virtual void callback() override;
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void processingMessage( const UniSetTypes::VoidMessage* msg ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ){};
virtual void askSensors( UniversalIO::UIOCommand cmd ){}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
......@@ -376,22 +376,22 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::init_dlog( std::shared_ptr&lt;Debug
<xsl:value-of select="$CLASSNAME"/>_SK::mylog = d;
}
// ------------------------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( UniSetTypes::VoidMessage* _msg )
void <xsl:value-of select="$CLASSNAME"/>_SK::processingMessage( const UniSetTypes::VoidMessage* _msg )
{
try
{
switch( _msg->type )
{
case Message::SensorInfo:
preSensorInfo( reinterpret_cast&lt;SensorMessage*&gt;(_msg) );
preSensorInfo( reinterpret_cast&lt;const SensorMessage*&gt;(_msg) );
break;
case Message::Timer:
preTimerInfo( reinterpret_cast&lt;TimerMessage*&gt;(_msg) );
preTimerInfo( reinterpret_cast&lt;const TimerMessage*&gt;(_msg) );
break;
case Message::SysCommand:
preSysCommand( reinterpret_cast&lt;SystemMessage*&gt;(_msg) );
preSysCommand( reinterpret_cast&lt;const SystemMessage*&gt;(_msg) );
break;
default:
......
conf/libuniset2.spec
View file @ 89ba4e3b
......@@ -14,7 +14,7 @@
Name: libuniset2
Version: 2.4
Release: alt1
Release: alt2
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
......@@ -484,6 +484,12 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%changelog
* Tue Jul 26 2016 Pavel Vainerman <pv@altlinux.ru> 2.4-alt2
- minor fixes
* Mon Jul 25 2016 Pavel Vainerman <pv@altlinux.ru> 2.4-alt1
- build new version
* Sun Jul 24 2016 Pavel Vainerman <pv@altlinux.ru> 2.3-alt10
- up build
......
extensions/include/UObject_SK.h
View file @ 89ba4e3b
......@@ -8,7 +8,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2016-06-02+03:00
// generate timestamp: 2016-07-26+03:00
// -----------------------------------------------------------------------------
#ifndef UObject_SK_H_
#define UObject_SK_H_
......@@ -144,7 +144,7 @@ class UObject_SK:
virtual void callback() override;
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void processingMessage( const UniSetTypes::VoidMessage* msg ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ){};
virtual void askSensors( UniversalIO::UIOCommand cmd ){}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) override{}
......
extensions/lib/UObject_SK.cc
View file @ 89ba4e3b
......@@ -11,7 +11,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2016-06-02+03:00
// generate timestamp: 2016-07-26+03:00
// -----------------------------------------------------------------------------
#include <memory>
#include <iomanip>
......@@ -328,22 +328,22 @@ void UObject_SK::init_dlog( std::shared_ptr<DebugStream> d )
UObject_SK::mylog = d;
}
// ------------------------------------------------------------------------------------------
void UObject_SK::processingMessage( UniSetTypes::VoidMessage* _msg )
void UObject_SK::processingMessage( const UniSetTypes::VoidMessage* _msg )
{
try
{
switch( _msg->type )
{
case Message::SensorInfo:
preSensorInfo( reinterpret_cast<SensorMessage*>(_msg) );
preSensorInfo( reinterpret_cast<const SensorMessage*>(_msg) );
break;
case Message::Timer:
preTimerInfo( reinterpret_cast<TimerMessage*>(_msg) );
preTimerInfo( reinterpret_cast<const TimerMessage*>(_msg) );
break;
case Message::SysCommand:
preSysCommand( reinterpret_cast<SystemMessage*>(_msg) );
preSysCommand( reinterpret_cast<const SystemMessage*>(_msg) );
break;
default:
......
include/DBServer.h
View file @ 89ba4e3b
......@@ -58,7 +58,7 @@ class DBServer:
protected:
virtual void processingMessage( UniSetTypes::VoidMessage* msg ) override;
virtual void processingMessage( const UniSetTypes::VoidMessage* msg ) override;
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) override;
virtual void confirmInfo( const UniSetTypes::ConfirmMessage* cmsg ) {}
......
include/PassiveObject.h
View file @ 89ba4e3b
......@@ -42,7 +42,7 @@ class PassiveObject
PassiveObject( UniSetTypes::ObjectId id, ProxyManager* mngr );
virtual ~PassiveObject();
virtual void processingMessage( UniSetTypes::VoidMessage* msg );
virtual void processingMessage( const UniSetTypes::VoidMessage* msg );
void setID( UniSetTypes::ObjectId id );
void init(ProxyManager* mngr);
......
include/ProxyManager.h
View file @ 89ba4e3b
......@@ -47,8 +47,8 @@ class ProxyManager:
protected:
ProxyManager();
virtual void processingMessage( UniSetTypes::VoidMessage* msg );
virtual void allMessage( UniSetTypes::VoidMessage* msg );
virtual void processingMessage( const UniSetTypes::VoidMessage* msg );
virtual void allMessage( const UniSetTypes::VoidMessage* msg );
virtual bool activateObject();
virtual bool deactivateObject();
......
include/UniSetObject.h
View file @ 89ba4e3b
......@@ -118,7 +118,7 @@ class UniSetObject:
protected:
/*! обработка приходящих сообщений */
virtual void processingMessage( UniSetTypes::VoidMessage* msg );
virtual void processingMessage( const UniSetTypes::VoidMessage* msg );
virtual void sysCommand( const UniSetTypes::SystemMessage* sm ) {}
virtual void sensorInfo( const UniSetTypes::SensorMessage* sm ) {}
virtual void timerInfo( const UniSetTypes::TimerMessage* tm ) {}
......
src/ObjectRepository/PassiveObject.cc
View file @ 89ba4e3b
......@@ -79,22 +79,22 @@ void PassiveObject::init( ProxyManager* _mngr )
}
// ------------------------------------------------------------------------------------------
void PassiveObject::processingMessage( UniSetTypes::VoidMessage* msg )
void PassiveObject::processingMessage( const UniSetTypes::VoidMessage* msg )
{
try
{
switch( msg->type )
{
case Message::SensorInfo:
sensorInfo( reinterpret_cast<SensorMessage*>(msg) );
sensorInfo( reinterpret_cast<const SensorMessage*>(msg) );
break;
case Message::Timer:
timerInfo( reinterpret_cast<TimerMessage*>(msg) );
timerInfo( reinterpret_cast<const TimerMessage*>(msg) );
break;
case Message::SysCommand:
sysCommand( reinterpret_cast<SystemMessage*>(msg) );
sysCommand( reinterpret_cast<const SystemMessage*>(msg) );
break;
default:
......
src/ObjectRepository/ProxyManager.cc
View file @ 89ba4e3b
......@@ -130,7 +130,7 @@ bool ProxyManager::deactivateObject()
return UniSetObject::deactivateObject();
}
// -------------------------------------------------------------------------
void ProxyManager::processingMessage( UniSetTypes::VoidMessage* msg )
void ProxyManager::processingMessage( const UniSetTypes::VoidMessage* msg )
{
try
{
......@@ -159,7 +159,7 @@ void ProxyManager::processingMessage( UniSetTypes::VoidMessage* msg )
}
}
// -------------------------------------------------------------------------
void ProxyManager::allMessage( UniSetTypes::VoidMessage* msg )
void ProxyManager::allMessage( const UniSetTypes::VoidMessage* msg )
{
for( auto& o : omap )
{
......
src/ObjectRepository/UniSetObject.cc
View file @ 89ba4e3b
......@@ -856,22 +856,22 @@ void UniSetObject::callback()
}
}
// ------------------------------------------------------------------------------------------
void UniSetObject::processingMessage( UniSetTypes::VoidMessage* msg )
void UniSetObject::processingMessage( const UniSetTypes::VoidMessage* msg )
{
try
{
switch( msg->type )
{
case Message::SensorInfo:
sensorInfo( reinterpret_cast<SensorMessage*>(msg) );
sensorInfo( reinterpret_cast<const SensorMessage*>(msg) );
break;
case Message::Timer:
timerInfo( reinterpret_cast<TimerMessage*>(msg) );
timerInfo( reinterpret_cast<const TimerMessage*>(msg) );
break;
case Message::SysCommand:
sysCommand( reinterpret_cast<SystemMessage*>(msg) );
sysCommand( reinterpret_cast<const SystemMessage*>(msg) );
break;
default:
......
src/Services/DBServer.cc
View file @ 89ba4e3b
......@@ -85,12 +85,12 @@ DBServer::~DBServer()
{
}
//--------------------------------------------------------------------------------------------
void DBServer::processingMessage( UniSetTypes::VoidMessage* msg )
void DBServer::processingMessage( const UniSetTypes::VoidMessage* msg )
{
switch(msg->type)
{
case Message::Confirm:
confirmInfo( reinterpret_cast<ConfirmMessage*>(msg) );
confirmInfo( reinterpret_cast<const ConfirmMessage*>(msg) );
break;
default:
......
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