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
8f6ba6d9
Commit
8f6ba6d9
authored
Nov 08, 2014
by
Aleksei Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
объявил некоторые методы виртуальными для наследования
parent
2c50e7ad
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
12 deletions
+26
-12
UNetExchange.cc
extensions/UNetUDP/UNetExchange.cc
+15
-4
UNetExchange.h
extensions/UNetUDP/UNetExchange.h
+4
-1
UNetReceiver.h
extensions/UNetUDP/UNetReceiver.h
+3
-3
UNetSender.h
extensions/UNetUDP/UNetSender.h
+4
-4
No files found.
extensions/UNetUDP/UNetExchange.cc
View file @
8f6ba6d9
...
@@ -120,7 +120,7 @@ sender2(0)
...
@@ -120,7 +120,7 @@ sender2(0)
}
}
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): init sender.. my node "
<<
n_it
.
getProp
(
"name"
)
<<
endl
;
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): init sender.. my node "
<<
n_it
.
getProp
(
"name"
)
<<
endl
;
sender
=
new
UNetS
ender
(
h
,
p
,
shm
,
s_field
,
s_fvalue
,
ic
);
sender
=
create_s
ender
(
h
,
p
,
shm
,
s_field
,
s_fvalue
,
ic
);
sender
->
setSendPause
(
sendpause
);
sender
->
setSendPause
(
sendpause
);
try
try
...
@@ -129,7 +129,7 @@ sender2(0)
...
@@ -129,7 +129,7 @@ sender2(0)
if
(
!
h2
.
empty
()
)
if
(
!
h2
.
empty
()
)
{
{
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): init sender2.. my node "
<<
n_it
.
getProp
(
"name"
)
<<
endl
;
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): init sender2.. my node "
<<
n_it
.
getProp
(
"name"
)
<<
endl
;
sender2
=
new
UNetS
ender
(
h2
,
p2
,
shm
,
s_field
,
s_fvalue
,
ic
);
sender2
=
create_s
ender
(
h2
,
p2
,
shm
,
s_field
,
s_fvalue
,
ic
);
sender2
->
setSendPause
(
sendpause
);
sender2
->
setSendPause
(
sendpause
);
}
}
}
}
...
@@ -241,7 +241,7 @@ sender2(0)
...
@@ -241,7 +241,7 @@ sender2(0)
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): (node='"
<<
n
<<
"') add receiver "
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): (node='"
<<
n
<<
"') add receiver "
<<
h2
<<
":"
<<
p2
<<
endl
;
<<
h2
<<
":"
<<
p2
<<
endl
;
UNetReceiver
*
r
=
new
UNetR
eceiver
(
h
,
p
,
shm
);
UNetReceiver
*
r
=
create_r
eceiver
(
h
,
p
,
shm
);
// на всякий принудительно разблокируем,
// на всякий принудительно разблокируем,
// чтобы не зависеть от значения по умолчанию
// чтобы не зависеть от значения по умолчанию
...
@@ -266,7 +266,7 @@ sender2(0)
...
@@ -266,7 +266,7 @@ sender2(0)
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): (node='"
<<
n
<<
"') add reserv receiver "
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(init): (node='"
<<
n
<<
"') add reserv receiver "
<<
h2
<<
":"
<<
p2
<<
endl
;
<<
h2
<<
":"
<<
p2
<<
endl
;
r2
=
new
UNetR
eceiver
(
h2
,
p2
,
shm
);
r2
=
create_r
eceiver
(
h2
,
p2
,
shm
);
// т.к. это резервный канал (по началу блокируем его)
// т.к. это резервный канал (по началу блокируем его)
r2
->
setLockUpdate
(
true
);
r2
->
setLockUpdate
(
true
);
...
@@ -351,6 +351,17 @@ UNetExchange::~UNetExchange()
...
@@ -351,6 +351,17 @@ UNetExchange::~UNetExchange()
delete
shm
;
delete
shm
;
}
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
UNetReceiver
*
UNetExchange
::
create_receiver
(
const
std
::
string
&
h
,
const
ost
::
tpport_t
p
,
SMInterface
*
shm
)
{
return
new
UNetReceiver
(
h
,
p
,
shm
);
}
// -----------------------------------------------------------------------------
UNetSender
*
UNetExchange
::
create_sender
(
const
std
::
string
h
,
const
ost
::
tpport_t
p
,
SMInterface
*
shm
,
const
std
::
string
s_field
,
const
std
::
string
s_fvalue
,
SharedMemory
*
ic
)
{
return
new
UNetSender
(
h
,
p
,
shm
,
s_field
,
s_fvalue
,
ic
);
}
// -----------------------------------------------------------------------------
bool
UNetExchange
::
checkExistUNetHost
(
const
std
::
string
&
addr
,
ost
::
tpport_t
port
)
bool
UNetExchange
::
checkExistUNetHost
(
const
std
::
string
&
addr
,
ost
::
tpport_t
port
)
{
{
ost
::
IPV4Address
a1
(
addr
.
c_str
());
ost
::
IPV4Address
a1
(
addr
.
c_str
());
...
...
extensions/UNetUDP/UNetExchange.h
View file @
8f6ba6d9
...
@@ -99,7 +99,10 @@ class UNetExchange:
...
@@ -99,7 +99,10 @@ class UNetExchange:
SMInterface
*
shm
;
SMInterface
*
shm
;
void
step
();
void
step
();
virtual
UNetReceiver
*
create_receiver
(
const
std
::
string
&
h
,
const
ost
::
tpport_t
p
,
SMInterface
*
shm
);
virtual
UNetSender
*
create_sender
(
const
std
::
string
h
,
const
ost
::
tpport_t
p
,
SMInterface
*
shm
,
const
std
::
string
s_field
=
""
,
const
std
::
string
s_fvalue
=
""
,
SharedMemory
*
ic
=
0
);
virtual
void
processingMessage
(
UniSetTypes
::
VoidMessage
*
msg
);
virtual
void
processingMessage
(
UniSetTypes
::
VoidMessage
*
msg
);
void
sysCommand
(
UniSetTypes
::
SystemMessage
*
msg
);
void
sysCommand
(
UniSetTypes
::
SystemMessage
*
msg
);
void
sensorInfo
(
UniSetTypes
::
SensorMessage
*
sm
);
void
sensorInfo
(
UniSetTypes
::
SensorMessage
*
sm
);
...
...
extensions/UNetUDP/UNetReceiver.h
View file @
8f6ba6d9
...
@@ -100,7 +100,7 @@ class UNetReceiver
...
@@ -100,7 +100,7 @@ class UNetReceiver
bool
recv
();
bool
recv
();
void
step
();
void
step
();
void
real_update
();
v
irtual
v
oid
real_update
();
void
initIterators
();
void
initIterators
();
...
@@ -187,8 +187,8 @@ class UNetReceiver
...
@@ -187,8 +187,8 @@ class UNetReceiver
bool
d_cache_init_ok
;
bool
d_cache_init_ok
;
bool
a_cache_init_ok
;
bool
a_cache_init_ok
;
void
initDCache
(
UniSetUDP
::
UDPMessage
&
pack
,
bool
force
=
false
);
v
irtual
v
oid
initDCache
(
UniSetUDP
::
UDPMessage
&
pack
,
bool
force
=
false
);
void
initACache
(
UniSetUDP
::
UDPMessage
&
pack
,
bool
force
=
false
);
v
irtual
v
oid
initACache
(
UniSetUDP
::
UDPMessage
&
pack
,
bool
force
=
false
);
};
};
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
#endif // UNetReceiver_H_
#endif // UNetReceiver_H_
...
...
extensions/UNetUDP/UNetSender.h
View file @
8f6ba6d9
...
@@ -49,7 +49,7 @@ class UNetSender
...
@@ -49,7 +49,7 @@ class UNetSender
void
real_send
();
void
real_send
();
/*! (принудительно) обновить все данные (из SM) */
/*! (принудительно) обновить все данные (из SM) */
void
updateFromSM
();
v
irtual
v
oid
updateFromSM
();
/*! Обновить значение по ID датчика */
/*! Обновить значение по ID датчика */
void
updateSensor
(
UniSetTypes
::
ObjectId
id
,
long
value
);
void
updateSensor
(
UniSetTypes
::
ObjectId
id
,
long
value
);
...
@@ -60,7 +60,7 @@ class UNetSender
...
@@ -60,7 +60,7 @@ class UNetSender
inline
void
setSendPause
(
int
msec
){
sendpause
=
msec
;
}
inline
void
setSendPause
(
int
msec
){
sendpause
=
msec
;
}
/*! заказать датчики */
/*! заказать датчики */
void
askSensors
(
UniversalIO
::
UIOCommand
cmd
);
v
irtual
v
oid
askSensors
(
UniversalIO
::
UIOCommand
cmd
);
/*! инициализация итераторов */
/*! инициализация итераторов */
void
initIterators
();
void
initIterators
();
...
@@ -72,10 +72,10 @@ class UNetSender
...
@@ -72,10 +72,10 @@ class UNetSender
SMInterface
*
shm
;
SMInterface
*
shm
;
bool
initItem
(
UniXML_iterator
&
it
);
virtual
bool
initItem
(
UniXML_iterator
&
it
);
bool
readItem
(
UniXML
&
xml
,
UniXML_iterator
&
it
,
xmlNode
*
sec
);
bool
readItem
(
UniXML
&
xml
,
UniXML_iterator
&
it
,
xmlNode
*
sec
);
void
readConfiguration
();
v
irtual
v
oid
readConfiguration
();
private
:
private
:
UNetSender
();
UNetSender
();
...
...
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