Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
6127c398
Commit
6127c398
authored
Mar 06, 2015
by
Pavel Vaynerman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.set:packages/uniset2
parents
4cac762e
4af4359c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
115 additions
and
59 deletions
+115
-59
ctl-cpp-cc-alone-ask.xsl
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
+1
-1
ctl-cpp-cc-alone.xsl
Utilities/codegen/ctl-cpp-cc-alone.xsl
+1
-1
ctl-cpp-cc-ask.xsl
Utilities/codegen/ctl-cpp-cc-ask.xsl
+1
-1
ctl-cpp-cc.xsl
Utilities/codegen/ctl-cpp-cc.xsl
+1
-1
ctl-cpp-common.xsl
Utilities/codegen/ctl-cpp-common.xsl
+60
-34
libuniset2.spec
conf/libuniset2.spec
+5
-1
UObject_SK.h
extensions/include/UObject_SK.h
+40
-14
UObject_SK.cc
extensions/lib/UObject_SK.cc
+6
-6
No files found.
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @
6127c398
...
...
@@ -181,7 +181,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if
test=
"normalize-space(@vartype)='out'"
>
if( _sid ==
<xsl:value-of
select=
"../../@name"
/>
)
{
ulog2
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= "
<<
_val
<<
endl;
mylog8
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= "
<<
_val
<<
endl;
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= _val;
<xsl:call-template
name=
"setdata"
/>
return;
...
...
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @
6127c398
...
...
@@ -154,7 +154,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if
test=
"normalize-space(@vartype)='out'"
>
if( _sid ==
<xsl:value-of
select=
"../../@name"
/>
)
{
ulog2
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= "
<<
_val
<<
endl;
mylog8
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= "
<<
_val
<<
endl;
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
= _val;
return;
}
...
...
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @
6127c398
...
...
@@ -112,7 +112,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
<xsl:if
test=
"normalize-space(@vartype)='out'"
>
if( _sid ==
<xsl:value-of
select=
"@name"
/>
)
{
ulog2
<<
"(setState):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= "
<<
_val
<<
endl;
mylog8
<<
"(setState):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= "
<<
_val
<<
endl;
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= _val;
<xsl:call-template
name=
"setdata"
/>
return;
...
...
Utilities/codegen/ctl-cpp-cc.xsl
View file @
6127c398
...
...
@@ -116,7 +116,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId sid
<xsl:if
test=
"normalize-space(@vartype)='out'"
>
if( sid ==
<xsl:value-of
select=
"@name"
/>
)
{
ulog2
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= "
<<
val
<<
endl;
mylog8
<<
"(setValue):
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= "
<<
val
<<
endl;
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
= val;
return;
}
...
...
Utilities/codegen/ctl-cpp-common.xsl
View file @
6127c398
...
...
@@ -106,7 +106,7 @@
<xsl:when
test=
"$GENTYPE='A'"
>
if( _code == mid_
<xsl:value-of
select=
"../../@name"
/>
)
{
u
log8
<<
"
<xsl:value-of
select=
"../../@name"
/>
"
<<
endl;
my
log8
<<
"
<xsl:value-of
select=
"../../@name"
/>
"
<<
endl;
m_
<xsl:value-of
select=
"../../@name"
/>
= _state;
try
{
...
...
@@ -133,7 +133,7 @@
}
catch( const UniSetTypes::Exception
&
ex )
{
ulog1
<<
getName()
<<
ex
<<
endl;
mywarn
<<
getName()
<<
ex
<<
endl;
}
}
</xsl:when>
...
...
@@ -175,19 +175,45 @@
void init_dlog( std::shared_ptr
<
DebugStream
>
d );
// "синтаксический сахар"..для логов
#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
#define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
#define mycrit if( mylog->debugging(Debug::CRIT) ) mylog->crit()
#define mylog1 if( mylog->debugging(Debug::LEVEL1) ) mylog->level1()
#define mylog2 if( mylog->debugging(Debug::LEVEL2) ) mylog->level2()
#define mylog3 if( mylog->debugging(Debug::LEVEL3) ) mylog->level3()
#define mylog4 if( mylog->debugging(Debug::LEVEL4) ) mylog->level4()
#define mylog5 if( mylog->debugging(Debug::LEVEL5) ) mylog->level5()
#define mylog6 if( mylog->debugging(Debug::LEVEL6) ) mylog->level6()
#define mylog7 if( mylog->debugging(Debug::LEVEL7) ) mylog->level7()
#define mylog8 if( mylog->debugging(Debug::LEVEL8) ) mylog->level8()
#define mylog9 if( mylog->debugging(Debug::LEVEL9) ) mylog->level9()
#define mylogany mylog->any()
#ifndef myinfo
#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
#endif
#ifndef mywarn
#define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
#endif
#ifndef mycrit
#define mycrit if( mylog->debugging(Debug::CRIT) ) mylog->crit()
#endif
#ifndef mylog1
#define mylog1 if( mylog->debugging(Debug::LEVEL1) ) mylog->level1()
#endif
#ifndef mylog2
#define mylog2 if( mylog->debugging(Debug::LEVEL2) ) mylog->level2()
#endif
#ifndef mylog3
#define mylog3 if( mylog->debugging(Debug::LEVEL3) ) mylog->level3()
#endif
#ifndef mylog4
#define mylog4 if( mylog->debugging(Debug::LEVEL4) ) mylog->level4()
#endif
#ifndef mylog5
#define mylog5 if( mylog->debugging(Debug::LEVEL5) ) mylog->level5()
#endif
#ifndef mylog6
#define mylog6 if( mylog->debugging(Debug::LEVEL6) ) mylog->level6()
#endif
#ifndef mylog7
#define mylog7 if( mylog->debugging(Debug::LEVEL7) ) mylog->level7()
#endif
#ifndef mylog8
#define mylog8 if( mylog->debugging(Debug::LEVEL8) ) mylog->level8()
#endif
#ifndef mylog9
#define mylog9 if( mylog->debugging(Debug::LEVEL9) ) mylog->level9()
#endif
#ifndef mylogany
#define mylogany mylog->any()
#endif
</xsl:template>
<xsl:template
name=
"COMMON-HEAD-PROTECTED"
>
...
...
@@ -458,28 +484,28 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
</xsl:template>
<xsl:template
name=
"init-variables"
>
<xsl:if
test=
"normalize-space(@type)='int'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='long'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='float'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(atof( init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
").c_str())),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(atof( init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
").c_str())),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='double'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(atof( init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
").c_str())),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(atof( init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
").c_str())),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='bool'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uni_atoi( init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='str'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
")),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
")),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='sensor'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uniset_conf()->getSensorID(init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uniset_conf()->getSensorID(init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
</xsl:if>
<xsl:if
test=
"normalize-space(@type)='object'"
>
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uniset_conf()->getObjectID(init3_str(uniset_conf()->getArgParam("--" +
argprefix
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
<xsl:value-of
select=
"normalize-space(@name)"
/>
(uniset_conf()->getObjectID(init3_str(uniset_conf()->getArgParam("--" +
(_argprefix.empty() ? myname+"-" : _argprefix)
+ "
<xsl:value-of
select=
"@name"
/>
"),uniset_conf()->getProp(cnode,"
<xsl:value-of
select=
"@name"
/>
"),"
<xsl:value-of
select=
"normalize-space(@default)"
/>
"))),
</xsl:if>
</xsl:template>
...
...
@@ -571,7 +597,7 @@ static const std::string init3_str( const std::string& s1, const std::string
<xsl:value-of
select=
"$CLASSNAME"
/>
_SK::
<xsl:value-of
select=
"$CLASSNAME"
/>
_SK( ObjectId id, xmlNode* cnode, const std::string
&
_argprefix ):
<xsl:if
test=
"normalize-space($BASECLASS)!=''"
><xsl:value-of
select=
"normalize-space($BASECLASS)"
/>
(id),
</xsl:if>
<xsl:if
test=
"normalize-space($BASECLASS)=''"
>
UniSetObject(id),
</xsl:if>
argprefix( (_argprefix.empty() ? myname+"-" : argprefix) ),
argprefix( (_argprefix.empty() ? myname+"-" :
_
argprefix) ),
// Инициализация идентификаторов (имена берутся из конф. файла)
<xsl:for-each
select=
"//smap/item"
>
<xsl:if
test=
"normalize-space(@vartype)!='io'"
>
...
...
@@ -809,18 +835,18 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
{
if( _code == UniSetTypes::DefaultObjectId )
{
u
crit
<<
getName()
my
crit
<<
getName()
<<
"(alarm): попытка послать сообщение с DefaultObjectId"
<<
endl;
return false;
}
ulog1
<<
getName()
<<
"(alarm): "
<<
( _state ? "SEND " : "RESET " )
<<
endl;
mylog8
<<
getName()
<<
"(alarm): "
<<
( _state ? "SEND " : "RESET " )
<<
endl;
<xsl:for-each
select=
"//msgmap/item"
>
if( _code ==
<xsl:value-of
select=
"@name"
/>
)
{
ulog1
<<
"
<xsl:value-of
select=
"@name"
/>
"
<<
endl;
mylog8
<<
"
<xsl:value-of
select=
"@name"
/>
"
<<
endl;
try
{
m_
<xsl:value-of
select=
"@name"
/>
= _state;
...
...
@@ -832,14 +858,14 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
}
catch( const std::exception
&
ex )
{
u
crit
<<
myname
<<
"(execute): catch "
<<
ex.what()
<<
endl;
my
crit
<<
myname
<<
"(execute): catch "
<<
ex.what()
<<
endl;
}
return false;
}
</xsl:for-each>
ulog1
<<
" not found MessgeOID?!!"
<<
endl;
mylog8
<<
" not found MessgeOID?!!"
<<
endl;
return false;
}
// -----------------------------------------------------------------------------
...
...
@@ -858,7 +884,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
}
catch( const UniSetTypes::Exception
&
ex )
{
ulog1
<<
getName()
<<
ex
<<
endl;
mywarn
<<
getName()
<<
ex
<<
endl;
}
}
</xsl:for-each>
...
...
@@ -917,7 +943,7 @@ activated(false),
askPause(2000),
forceOut(false)
{
u
crit
<<
"
<xsl:value-of
select=
"$CLASSNAME"
/>
: init failed!!!!!!!!!!!!!!!"
<<
endl;
my
crit
<<
"
<xsl:value-of
select=
"$CLASSNAME"
/>
: init failed!!!!!!!!!!!!!!!"
<<
endl;
throw Exception( string(myname+": init failed!!!") );
}
// -----------------------------------------------------------------------------
...
...
@@ -1094,13 +1120,13 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
{
if( _code == UniSetTypes::DefaultObjectId )
{
u
crit
<<
getName()
my
crit
<<
getName()
<<
"(alarm): попытка послать сообщение с DefaultObjectId"
<<
endl;
return false;
}
ulog1
<<
getName()
<<
"(alarm): ("
<<
_code
<<
")"
<<
( _state ? "SEND" : "RESET" )
<<
endl;
mylog8
<<
getName()
<<
"(alarm): ("
<<
_code
<<
")"
<<
( _state ? "SEND" : "RESET" )
<<
endl;
<xsl:for-each
select=
"//sensors/item"
>
<xsl:call-template
name=
"setmsg"
>
...
...
@@ -1108,7 +1134,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::alarm( UniSetTypes::ObjectId _code,
</xsl:call-template>
</xsl:for-each>
u
log8
<<
" not found MessgeOID?!!"
<<
endl;
my
log8
<<
" not found MessgeOID?!!"
<<
endl;
return false;
}
// -----------------------------------------------------------------------------
...
...
conf/libuniset2.spec
View file @
6127c398
...
...
@@ -12,7 +12,7 @@
Name: libuniset2
Version: 2.0
Release: alt1
8
Release: alt1
9
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -409,6 +409,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%changelog
* Fri Mar 06 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt19
- codegen: fixed bug (in previous commit)
- codegen: fixed warning (redefined mylog macroses)
* Sat Feb 28 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt18
- codegen: set default argprefix=myname (object name)
- codegen: fixed minor bug in mylog..
...
...
extensions/include/UObject_SK.h
View file @
6127c398
...
...
@@ -8,7 +8,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2015-0
2-28
+03:00
// generate timestamp: 2015-0
3-06
+03:00
// -----------------------------------------------------------------------------
#ifndef UObject_SK_H_
#define UObject_SK_H_
...
...
@@ -42,19 +42,45 @@ class UObject_SK:
void
init_dlog
(
std
::
shared_ptr
<
DebugStream
>
d
);
// "синтаксический сахар"..для логов
#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
#define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
#define mycrit if( mylog->debugging(Debug::CRIT) ) mylog->crit()
#define mylog1 if( mylog->debugging(Debug::LEVEL1) ) mylog->level1()
#define mylog2 if( mylog->debugging(Debug::LEVEL2) ) mylog->level2()
#define mylog3 if( mylog->debugging(Debug::LEVEL3) ) mylog->level3()
#define mylog4 if( mylog->debugging(Debug::LEVEL4) ) mylog->level4()
#define mylog5 if( mylog->debugging(Debug::LEVEL5) ) mylog->level5()
#define mylog6 if( mylog->debugging(Debug::LEVEL6) ) mylog->level6()
#define mylog7 if( mylog->debugging(Debug::LEVEL7) ) mylog->level7()
#define mylog8 if( mylog->debugging(Debug::LEVEL8) ) mylog->level8()
#define mylog9 if( mylog->debugging(Debug::LEVEL9) ) mylog->level9()
#define mylogany mylog->any()
#ifndef myinfo
#define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
#endif
#ifndef mywarn
#define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
#endif
#ifndef mycrit
#define mycrit if( mylog->debugging(Debug::CRIT) ) mylog->crit()
#endif
#ifndef mylog1
#define mylog1 if( mylog->debugging(Debug::LEVEL1) ) mylog->level1()
#endif
#ifndef mylog2
#define mylog2 if( mylog->debugging(Debug::LEVEL2) ) mylog->level2()
#endif
#ifndef mylog3
#define mylog3 if( mylog->debugging(Debug::LEVEL3) ) mylog->level3()
#endif
#ifndef mylog4
#define mylog4 if( mylog->debugging(Debug::LEVEL4) ) mylog->level4()
#endif
#ifndef mylog5
#define mylog5 if( mylog->debugging(Debug::LEVEL5) ) mylog->level5()
#endif
#ifndef mylog6
#define mylog6 if( mylog->debugging(Debug::LEVEL6) ) mylog->level6()
#endif
#ifndef mylog7
#define mylog7 if( mylog->debugging(Debug::LEVEL7) ) mylog->level7()
#endif
#ifndef mylog8
#define mylog8 if( mylog->debugging(Debug::LEVEL8) ) mylog->level8()
#endif
#ifndef mylog9
#define mylog9 if( mylog->debugging(Debug::LEVEL9) ) mylog->level9()
#endif
#ifndef mylogany
#define mylogany mylog->any()
#endif
// Используемые идентификаторы
...
...
extensions/lib/UObject_SK.cc
View file @
6127c398
...
...
@@ -11,7 +11,7 @@
ВСЕ ВАШИ ИЗМЕНЕНИЯ БУДУТ ПОТЕРЯНЫ.
*/
// --------------------------------------------------------------------------
// generate timestamp: 2015-0
2-28
+03:00
// generate timestamp: 2015-0
3-06
+03:00
// -----------------------------------------------------------------------------
#include <memory>
#include "Configuration.h"
...
...
@@ -62,7 +62,7 @@ static const std::string init3_str( const std::string& s1, const std::string& s2
// -----------------------------------------------------------------------------
UObject_SK
::
UObject_SK
(
ObjectId
id
,
xmlNode
*
cnode
,
const
std
::
string
&
_argprefix
)
:
UniSetObject
(
id
),
argprefix
(
(
_argprefix
.
empty
()
?
myname
+
"-"
:
argprefix
)
),
argprefix
(
(
_argprefix
.
empty
()
?
myname
+
"-"
:
_
argprefix
)
),
// Инициализация идентификаторов (имена берутся из конф. файла)
// Используемые идентификаторы сообщений (имена берутся из конф. файла)
...
...
@@ -103,7 +103,7 @@ end_private(false)
mylog
->
setLogName
(
myname
);
{
ostringstream
s
;
s
<<
argprefix
<<
"
-
log"
;
s
<<
argprefix
<<
"log"
;
conf
->
initLogStream
(
mylog
,
s
.
str
());
}
...
...
@@ -186,17 +186,17 @@ bool UObject_SK::alarm( UniSetTypes::ObjectId _code, bool _state )
{
if
(
_code
==
UniSetTypes
::
DefaultObjectId
)
{
u
crit
<<
getName
()
my
crit
<<
getName
()
<<
"(alarm): попытка послать сообщение с DefaultObjectId"
<<
endl
;
return
false
;
}
ulog1
<<
getName
()
<<
"(alarm): "
<<
(
_state
?
"SEND "
:
"RESET "
)
<<
endl
;
mylog8
<<
getName
()
<<
"(alarm): "
<<
(
_state
?
"SEND "
:
"RESET "
)
<<
endl
;
ulog1
<<
" not found MessgeOID?!!"
<<
endl
;
mylog8
<<
" not found MessgeOID?!!"
<<
endl
;
return
false
;
}
// -----------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment