generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-20 14:02:41 +02:00
Code Issues Projects Releases Wiki Activity

Remove delay options

Browse Source 
These were exposed to users, but have subsequently been removed as
sockopts. They are currently only being used by ZAP, so I've moved it to
a simpl function call (actually it's only used in one case even in that,
so there may be a further simplification possible there).
This commit is contained in:
Ian Barber
2013-08-18 11:16:21 +01:00
parent cb35fd7bfe
commit 531d3ebc09
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/session_base.cpp
View File

@@ -299,14 +299,15 @@ int zmq::session_base_t::zap_connect ()
object_t *parents [2] = {this, peer.socket};
pipe_t *new_pipes [2] = {NULL, NULL};
int hwms [2] = {0, 0};
bool delays [2] = {false, false};
int rc = pipepair (parents, new_pipes, hwms, delays);
int rc = pipepair (parents, new_pipes, hwms);
errno_assert (rc == 0);
// Attach local end of the pipe to this socket object.
zap_pipe = new_pipes [0];
zap_pipe->set_nodelay ();
zap_pipe->set_event_sink (this);
new_pipes [1]->set_nodelay ();
send_bind (peer.socket, new_pipes [1], false);
// Send empty identity if required by the peer.
@@ -332,8 +333,7 @@ void zmq::session_base_t::process_attach (i_engine *engine_)
object_t *parents [2] = {this, socket};
pipe_t *pipes [2] = {NULL, NULL};
int hwms [2] = {options.rcvhwm, options.sndhwm};
bool delays [2] = {options.delay_on_close, options.delay_on_disconnect};
int rc = pipepair (parents, pipes, hwms, delays);
int rc = pipepair (parents, pipes, hwms);
errno_assert (rc == 0);
// Plug the local end of the pipe.
@@ -378,7 +378,7 @@ void zmq::session_base_t::process_term (int linger_)
// If the termination of the pipe happens before the term command is
// delivered there's nothing much to do. We can proceed with the
// stadard termination immediately.
// standard termination immediately.
if (!pipe && !zap_pipe) {
proceed_with_term ();
return;