diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-03-24 12:27:06 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-03-24 12:27:06 +0100 |
commit | 8463b4d55e45ea29d5a23f867e7f1c0077279ee7 (patch) | |
tree | 2c728398c1a8e7bd9b1bcb938fbce8a543147e1c /src/socket_base.cpp | |
parent | fb27a000d9383b503761d0124e7bd41115d70c9a (diff) |
SWAP functionality removed
On-disk storage should be implemented in devices rather than
in 0MQ core. 0MQ is a networking library and there's no point
in storing network buffers on disk.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/socket_base.cpp')
-rw-r--r-- | src/socket_base.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp index abeddb9..093bbe0 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -376,28 +376,22 @@ int zmq::socket_base_t::connect (const char *addr_) writer_t *outpipe_writer = NULL; // The total HWM for an inproc connection should be the sum of - // the binder's HWM and the connector's HWM. (Similarly for the - // SWAP.) + // the binder's HWM and the connector's HWM. int64_t hwm; if (options.hwm == 0 || peer.options.hwm == 0) hwm = 0; else hwm = options.hwm + peer.options.hwm; - int64_t swap; - if (options.swap == 0 && peer.options.swap == 0) - swap = 0; - else - swap = options.swap + peer.options.swap; // Create inbound pipe, if required. if (options.requires_in) - create_pipe (this, peer.socket, hwm, swap, - &inpipe_reader, &inpipe_writer); + create_pipe (this, peer.socket, hwm, &inpipe_reader, + &inpipe_writer); // Create outbound pipe, if required. if (options.requires_out) - create_pipe (peer.socket, this, hwm, swap, - &outpipe_reader, &outpipe_writer); + create_pipe (peer.socket, this, hwm, &outpipe_reader, + &outpipe_writer); // Attach the pipes to this socket object. attach_pipes (inpipe_reader, outpipe_writer, peer.options.identity); @@ -435,12 +429,12 @@ int zmq::socket_base_t::connect (const char *addr_) // Create inbound pipe, if required. if (options.requires_in) - create_pipe (this, session, options.hwm, options.swap, + create_pipe (this, session, options.hwm, &inpipe_reader, &inpipe_writer); // Create outbound pipe, if required. if (options.requires_out) - create_pipe (session, this, options.hwm, options.swap, + create_pipe (session, this, options.hwm, &outpipe_reader, &outpipe_writer); // Attach the pipes to the socket object. |