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
ac4ee7d1
Commit
ac4ee7d1
authored
Oct 25, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправления по результатам компиляции в travis-ci.org
parent
e959c3a8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
28 deletions
+25
-28
configure.ac
configure.ac
+1
-1
MBSlave.h
extensions/ModbusSlave/MBSlave.h
+5
-5
UniSetManager_LT.h
include/UniSetManager_LT.h
+1
-1
UniSetObject.h
include/UniSetObject.h
+10
-13
UniSetObject.cc
src/ObjectRepository/UniSetObject.cc
+8
-8
No files found.
configure.ac
View file @
ac4ee7d1
...
...
@@ -274,7 +274,7 @@ AC_SUBST(COV_CFLAGS)
AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true)
AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
# -Weffc++
# -Weffc++
-Wno-unused-variable"
CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual -Werror"
# export
...
...
extensions/ModbusSlave/MBSlave.h
View file @
ac4ee7d1
...
...
@@ -475,11 +475,11 @@ class MBSlave:
void
readConfiguration
();
bool
check_item
(
UniXML
::
iterator
&
it
);
ModbusRTU
::
mbErrCode
real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
,
ModbusRTU
::
ModbusData
val
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
,
ModbusRTU
::
ModbusData
*
dat
,
int
&
i
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_read
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
,
ModbusRTU
::
ModbusData
&
val
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
much_real_read
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
,
ModbusRTU
::
ModbusData
*
dat
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
much_real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
,
ModbusRTU
::
ModbusData
*
dat
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
OKOK
,
ModbusRTU
::
ModbusData
val
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
OKOK
,
ModbusRTU
::
ModbusData
*
dat
,
int
&
i
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_read
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
OKOK
,
ModbusRTU
::
ModbusData
&
val
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
much_real_read
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
OKOK
,
ModbusRTU
::
ModbusData
*
dat
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
much_real_write
(
RegMap
&
rmap
,
const
ModbusRTU
::
ModbusData
reg
OKOK
,
ModbusRTU
::
ModbusData
*
dat
,
int
count
,
const
int
fn
=
0
);
ModbusRTU
::
mbErrCode
real_read_it
(
RegMap
&
rmap
,
RegMap
::
iterator
&
it
,
ModbusRTU
::
ModbusData
&
val
);
ModbusRTU
::
mbErrCode
real_bitreg_read_it
(
std
::
shared_ptr
<
BitRegProperty
>&
bp
,
ModbusRTU
::
ModbusData
&
val
);
...
...
include/UniSetManager_LT.h
View file @
ac4ee7d1
...
...
@@ -55,7 +55,7 @@ class UniSetManager_LT:
/*! функция вызываемая из потока */
virtual
void
callback
();
in
t
sleepTime
;
timeout_
t
sleepTime
;
LT_Object
lt
;
private
:
};
...
...
include/UniSetObject.h
View file @
ac4ee7d1
...
...
@@ -181,11 +181,9 @@ class UniSetObject:
void
setID
(
UniSetTypes
::
ObjectId
id
);
void
setMaxSizeOfMessageQueue
(
unsigned
int
s
)
void
setMaxSizeOfMessageQueue
(
size_t
s
)
{
if
(
s
>=
0
)
SizeOfMessageQueue
=
s
;
SizeOfMessageQueue
=
s
;
}
inline
unsigned
int
getMaxSizeOfMessageQueue
()
...
...
@@ -193,10 +191,9 @@ class UniSetObject:
return
SizeOfMessageQueue
;
}
void
setMaxCountRemoveOfMessage
(
unsigned
in
t
m
)
void
setMaxCountRemoveOfMessage
(
size_
t
m
)
{
if
(
m
>=
0
)
MaxCountRemoveOfMessage
=
m
;
MaxCountRemoveOfMessage
=
m
;
}
inline
unsigned
int
getMaxCountRemoveOfMessage
()
...
...
@@ -270,7 +267,7 @@ class UniSetObject:
void
init_object
();
pid_t
msgpid
;
// pid потока обработки сообщений
bool
reg
;
bool
reg
OK
=
{
false
}
;
std
::
atomic_bool
active
;
bool
threadcreate
;
...
...
@@ -290,13 +287,13 @@ class UniSetObject:
mutable
UniSetTypes
::
uniset_rwmutex
refmutex
;
/*! размер очереди сообщений (при превышении происходит очистка) */
unsigned
in
t
SizeOfMessageQueue
;
/*! сколько сообщений удалять при очисте*/
unsigned
in
t
MaxCountRemoveOfMessage
;
size_
t
SizeOfMessageQueue
;
/*! сколько сообщений удалять при очисте
*/
size_
t
MaxCountRemoveOfMessage
;
// статистическая информация
unsigned
long
stMaxQueueMessages
;
/*<! Максимальное число сообщений хранившихся в очереди */
unsigned
long
stCountOfQueueFull
;
/*!< количество переполнений очереди сообщений */
size_t
stMaxQueueMessages
;
/*<! Максимальное число сообщений хранившихся в очереди */
size_t
stCountOfQueueFull
;
/*!< количество переполнений очереди сообщений */
std
::
atomic_bool
a_working
;
std
::
mutex
m_working
;
...
...
src/ObjectRepository/UniSetObject.cc
View file @
ac4ee7d1
...
...
@@ -49,7 +49,7 @@ using namespace UniSetTypes;
// ------------------------------------------------------------------------------------------
UniSetObject
::
UniSetObject
()
:
msgpid
(
0
),
reg
(
false
),
reg
OK
(
false
),
active
(
0
),
threadcreate
(
false
),
myid
(
UniSetTypes
::
DefaultObjectId
),
...
...
@@ -69,7 +69,7 @@ UniSetObject::UniSetObject():
// ------------------------------------------------------------------------------------------
UniSetObject
::
UniSetObject
(
ObjectId
id
)
:
msgpid
(
0
),
reg
(
false
),
reg
OK
(
false
),
active
(
0
),
threadcreate
(
true
),
myid
(
id
),
...
...
@@ -102,7 +102,7 @@ UniSetObject::UniSetObject( ObjectId id ):
UniSetObject
::
UniSetObject
(
const
string
&
name
,
const
string
&
section
)
:
msgpid
(
0
),
reg
(
false
),
reg
OK
(
false
),
active
(
0
),
threadcreate
(
true
),
myid
(
UniSetTypes
::
DefaultObjectId
),
...
...
@@ -382,7 +382,7 @@ void UniSetObject::registered()
объект станет недоступен другим, а знать об этом не будет!!!
*/
ucrit
<<
myname
<<
"(registered): replace object (ObjectNameAlready)"
<<
endl
;
reg
=
true
;
reg
OK
=
true
;
unregister
();
}
}
...
...
@@ -399,7 +399,7 @@ void UniSetObject::registered()
throw
ORepFailed
(
err
.
c_str
());
}
reg
=
true
;
reg
OK
=
true
;
}
// ------------------------------------------------------------------------------------------
void
UniSetObject
::
unregister
()
...
...
@@ -410,7 +410,7 @@ void UniSetObject::unregister()
if
(
myid
==
UniSetTypes
::
DefaultObjectId
)
{
uinfo
<<
myname
<<
"(unregister): myid=DefaultObjectId
\n
"
;
reg
=
false
;
reg
OK
=
false
;
return
;
}
...
...
@@ -420,7 +420,7 @@ void UniSetObject::unregister()
if
(
!
oref
)
{
uwarn
<<
myname
<<
"(unregister): oref NULL!"
<<
endl
;
reg
=
false
;
reg
OK
=
false
;
return
;
}
}
...
...
@@ -437,7 +437,7 @@ void UniSetObject::unregister()
uwarn
<<
myname
<<
": don`t registration in object repository"
<<
endl
;
}
reg
=
false
;
reg
OK
=
false
;
}
// ------------------------------------------------------------------------------------------
CORBA
::
Boolean
UniSetObject
::
exist
()
...
...
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