generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-29 12:18:04 +01:00
Code Issues Projects Releases Wiki Activity

Session termination induced by socket fixed

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-05-31 14:36:51 +02:00
parent 0b59866a84
commit a24a7c15a8
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pipe.cpp
View File

@@ -301,8 +301,11 @@ void zmq::pipe_t::process_pipe_term_ack ()
delete this;
}
void zmq::pipe_t::terminate ()
void zmq::pipe_t::terminate (bool delay_)
{
// Overload the value specified at pipe creation.
delay = delay_;
// If terminate was already called, we can ignore the duplicit invocation.
if (state == terminated || state == double_terminated)
return;
@@ -321,9 +324,13 @@ void zmq::pipe_t::terminate ()
// There are still pending messages available, but the user calls
// 'terminate'. We can act as if all the pending messages were read.
else if (state == pending) {
send_pipe_term_ack (peer);
state = terminating;
else if (state == pending && !delay) {
send_pipe_term_ack (peer);
state = terminating;
}
// If there are pending messages still availabe, do nothing.
else if (state == pending && delay) {
}
// We've already got delimiter, but not term command yet. We can ignore
@@ -338,8 +345,7 @@ void zmq::pipe_t::terminate ()
else
zmq_assert (false);
// Stop inbound and outbound flow of messages.
in_active = false;
// Stop outbound flow of messages.
out_active = false;
// Rollback any unfinished outbound messages.