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
f79235a9
Commit
f79235a9
authored
Oct 02, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(unet2): попытка решить проблему с SEGFAULT.
у и подправил пару опечаток в комментариях.
parent
0bcf4930
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
test.xml
conf/test.xml
+1
-0
UDPPacket.cc
extensions/UNet2/UDPPacket.cc
+2
-2
UNetReceiver.cc
extensions/UNet2/UNetReceiver.cc
+1
-1
UNetReceiver.h
extensions/UNet2/UNetReceiver.h
+1
-1
No files found.
conf/test.xml
View file @
f79235a9
...
...
@@ -89,6 +89,7 @@
<item
baddr=
"0x110"
card=
"3"
dev=
"/dev/comedi1"
name=
"UNIO48"
subdev1=
"TBI24_0"
subdev2=
"TBI16_8"
/>
</iocards>
</item>
<item
infserver=
"InfoServer"
ip=
"127.0.0.1"
name=
"LocalhostNode1"
textname=
"Локальный узел"
unet_ignore=
"0"
unet_port=
"2049"
/>
<item
ip=
"192.168.56.10"
name=
"Node1"
textname=
"Node1"
unet_port=
"3001"
unet_ip=
"192.168.56.255"
unet_ignore=
"1"
/>
<item
ip=
"192.168.56.11"
name=
"Node2"
textname=
"Node2"
unet_port=
"3002"
unet_ip=
"192.168.56.255"
unet_ignore=
"1"
/>
</nodes>
...
...
extensions/UNet2/UDPPacket.cc
View file @
f79235a9
...
...
@@ -138,7 +138,7 @@ size_t UDPMessage::transport_msg( UDPPacket& p )
memcpy
(
&
(
p
.
data
[
i
]),
a_dat
,
sz
);
i
+=
sz
;
// копируем булеве индексы
// копируем булев
ы
е индексы
sz
=
dcount
*
sizeof
(
long
);
memcpy
(
&
(
p
.
data
[
i
]),
d_id
,
sz
);
i
+=
sz
;
...
...
@@ -172,7 +172,7 @@ size_t UDPMessage::getMessage( UDPMessage& m, UDPPacket& p )
memcpy
(
m
.
a_dat
,
&
(
p
.
data
[
i
]),
sz
);
i
+=
sz
;
// копируем булеве индексы
// копируем булев
ы
е индексы
sz
=
m
.
dcount
*
sizeof
(
long
);
memcpy
(
m
.
d_id
,
&
(
p
.
data
[
i
]),
sz
);
i
+=
sz
;
...
...
extensions/UNet2/UNetReceiver.cc
View file @
f79235a9
...
...
@@ -327,7 +327,7 @@ bool UNetReceiver::recv()
if
(
!
udp
->
isInputReady
(
recvTimeout
)
)
return
false
;
size_t
ret
=
udp
->
UDPReceive
::
receive
((
char
*
)(
&
r_buf
),
sizeof
(
r_buf
));
size_t
ret
=
udp
->
UDPReceive
::
receive
((
char
*
)(
r_buf
.
data
),
sizeof
(
r_buf
.
data
));
size_t
sz
=
UniSetUDP
::
UDPMessage
::
getMessage
(
pack
,
r_buf
);
if
(
sz
==
0
)
...
...
extensions/UNet2/UNetReceiver.h
View file @
f79235a9
...
...
@@ -114,7 +114,7 @@ class UNetReceiver
};
typedef
std
::
priority_queue
<
UniSetUDP
::
UDPMessage
,
std
::
vector
<
UniSetUDP
::
UDPMessage
>
,
PacketCompare
>
PacketQueue
;
PacketQueue
qpack
;
/*!< очередь принятых пакетов (отсортированных по возрастанию номера пакета) */
UniSetUDP
::
UDPMessage
pack
;
/*!< просто буфер для получения очере
l
ного сообщения */
UniSetUDP
::
UDPMessage
pack
;
/*!< просто буфер для получения очере
д
ного сообщения */
UniSetUDP
::
UDPPacket
r_buf
;
UniSetTypes
::
uniset_mutex
packMutex
;
/*!< mutex для работы с очередью */
unsigned
long
pnum
;
/*!< текущий номер обработанного сообщения, для проверки непрерывности последовательности пакетов */
...
...
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