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

Merge branch 'master' into events

Browse Source
This commit is contained in:
Lourens Naudé
2012-05-04 02:35:22 +01:00
parent 5c6f72c17c 47dbd4aa96
commit c38aecdc50
9 changed files with 94 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/stream_engine.cpp
View File

@@ -47,6 +47,7 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_) :
inpos (NULL),
insize (0),
decoder (in_batch_size, options_.maxmsgsize),
input_error (false),
outpos (NULL),
outsize (0),
encoder (out_batch_size),
@@ -55,7 +56,7 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_) :
options (options_),
plugged (false)
{
// Get the socket into non-blocking mode.
// Put the socket into non-blocking mode.
unblock_socket (s);
// Set the socket buffer limits for the underlying socket.
@@ -205,8 +206,18 @@ void zmq::stream_engine_t::in_event ()
session->flush ();
}
if (session && disconnection)
error ();
// Input error has occurred. If the last decoded
// message has already been accepted, we terminate
// the engine immediately. Otherwise, we stop
// waiting for input events and postpone the termination
// until after the session has accepted the message.
if (session != NULL && disconnection) {
input_error = true;
if (decoder.stalled ())
reset_pollin (handle);
else
error ();
}
}
void zmq::stream_engine_t::out_event ()
@@ -238,9 +249,11 @@ void zmq::stream_engine_t::out_event ()
// written should be reasonably modest.
int nbytes = write (outpos, outsize);
// Handle problems with the connection.
// IO error has occurred. We stop waiting for output events.
// The engine is not terminated until we detect input error;
// this is necessary to prevent losing incomming messages.
if (nbytes == -1) {
error ();
reset_pollout (handle);
return;
}
@@ -261,6 +274,17 @@ void zmq::stream_engine_t::activate_out ()
void zmq::stream_engine_t::activate_in ()
{
if (input_error) {
// There was an input error but the engine could not
// be terminated (due to the stalled decoder).
// Flush the pending message and terminate the engine now.
decoder.process_buffer (inpos, 0);
zmq_assert (!decoder.stalled ());
session->flush ();
error ();
return;
}
set_pollin (handle);
// Speculative read.