Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
5b8af52e
Commit
5b8af52e
authored
Oct 11, 2010
by
Steven McCoy
Committed by
Martin Sustrik
Oct 11, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix assertion in PGM transports on cancel_timer
Signed-off-by:
Steven McCoy
<
steven.mccoy@miru.hk
>
parent
e1681731
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
pgm_receiver.cpp
src/pgm_receiver.cpp
+2
-0
pgm_sender.cpp
src/pgm_sender.cpp
+7
-3
No files found.
src/pgm_receiver.cpp
View file @
5b8af52e
...
...
@@ -235,6 +235,8 @@ void zmq::pgm_receiver_t::timer_event (int token)
{
zmq_assert
(
token
==
rx_timer_id
);
// Timer cancels on return by poller_base.
has_rx_timer
=
false
;
in_event
();
}
...
...
src/pgm_sender.cpp
View file @
5b8af52e
...
...
@@ -188,11 +188,15 @@ void zmq::pgm_sender_t::out_event ()
void
zmq
::
pgm_sender_t
::
timer_event
(
int
token
)
{
if
(
token
==
rx_timer_id
)
// Timer cancels on return by poller_base.
if
(
token
==
rx_timer_id
)
{
has_rx_timer
=
false
;
in_event
();
zmq_assert
(
token
==
tx_timer_id
)
;
}
else
if
(
token
==
tx_timer_id
)
{
has_tx_timer
=
false
;
out_event
();
}
else
zmq_assert
(
false
);
}
#endif
...
...
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