generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 02:57:47 +01:00
Code Issues Projects Releases Wiki Activity

ZMQ_RATE and ZMQ_RECOVERY_IVL types cahnged to int

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-03-24 15:18:20 +01:00
parent d61f067f5b
commit bd9d7715eb
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/zmq_getsockopt.txt
View File

@ -131,7 +131,7 @@ The 'ZMQ_RATE' option shall retrieve the maximum send or receive data rate for
multicast transports using the specified 'socket'. multicast transports using the specified 'socket'.
[horizontal] [horizontal]
Option value type:: int64_t Option value type:: int
Option value unit:: kilobits per second Option value unit:: kilobits per second
Default value:: 100 Default value:: 100
Applicable socket types:: all, when using multicast transports Applicable socket types:: all, when using multicast transports
@ -145,7 +145,7 @@ determines the maximum time in milliseconds that a receiver can be absent from a
multicast group before unrecoverable data loss will occur. multicast group before unrecoverable data loss will occur.
[horizontal] [horizontal]
Option value type:: int64_t Option value type:: int
Option value unit:: milliseconds Option value unit:: milliseconds
Default value:: 10000 Default value:: 10000
Applicable socket types:: all, when using multicast transports Applicable socket types:: all, when using multicast transports

4
doc/zmq_setsockopt.txt
View File

@ -133,7 +133,7 @@ The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'. multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'.
[horizontal] [horizontal]
Option value type:: int64_t Option value type:: int
Option value unit:: kilobits per second Option value unit:: kilobits per second
Default value:: 100 Default value:: 100
Applicable socket types:: all, when using multicast transports Applicable socket types:: all, when using multicast transports
@ -151,7 +151,7 @@ needed for recovery will be held in memory. For example, a 1 minute recovery
interval at a data rate of 1Gbps requires a 7GB in-memory buffer. interval at a data rate of 1Gbps requires a 7GB in-memory buffer.
[horizontal] [horizontal]
Option value type:: int64_t Option value type:: int
Option value unit:: milliseconds Option value unit:: milliseconds
Default value:: 10000 Default value:: 10000
Applicable socket types:: all, when using multicast transports Applicable socket types:: all, when using multicast transports

21
src/options.cpp
View File

@ -79,19 +79,19 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
case ZMQ_RATE: case ZMQ_RATE:
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) <= 0) { if (optvallen_ != sizeof (int) || *((int*) optval_) <= 0) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
rate = (uint32_t) *((int64_t*) optval_); rate = *((int*) optval_);
return 0; return 0;
case ZMQ_RECOVERY_IVL: case ZMQ_RECOVERY_IVL:
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) { if (optvallen_ != sizeof (int) || *((int*) optval_) < 0) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
recovery_ivl = (uint32_t) *((int64_t*) optval_); recovery_ivl = *((int*) optval_);
return 0; return 0;
case ZMQ_SNDBUF: case ZMQ_SNDBUF:
@ -195,23 +195,22 @@ int zmq::options_t::getsockopt (int option_, void *optval_, size_t *optvallen_)
*optvallen_ = identity.size (); *optvallen_ = identity.size ();
return 0; return 0;
case ZMQ_RATE: case ZMQ_RATE:
if (*optvallen_ < sizeof (int64_t)) { if (*optvallen_ < sizeof (int)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
*((int64_t*) optval_) = rate; *((int*) optval_) = rate;
*optvallen_ = sizeof (int64_t); *optvallen_ = sizeof (int);
return 0; return 0;
case ZMQ_RECOVERY_IVL: case ZMQ_RECOVERY_IVL:
if (*optvallen_ < sizeof (int64_t)) { if (*optvallen_ < sizeof (int)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
*((int64_t*) optval_) = recovery_ivl; *((int*) optval_) = recovery_ivl;
*optvallen_ = sizeof (int64_t); *optvallen_ = sizeof (int);
return 0; return 0;
case ZMQ_SNDBUF: case ZMQ_SNDBUF:

5
src/options.hpp
View File

@ -40,10 +40,10 @@ namespace zmq
blob_t identity; blob_t identity;
// Maximum tranfer rate [kb/s]. Default 100kb/s. // Maximum tranfer rate [kb/s]. Default 100kb/s.
uint32_t rate; int rate;
// Reliability time interval [ms]. Default 10 seconds. // Reliability time interval [ms]. Default 10 seconds.
uint32_t recovery_ivl; int recovery_ivl;
// SO_SNDBUF and SO_RCVBUF to be passed to underlying transport sockets. // SO_SNDBUF and SO_RCVBUF to be passed to underlying transport sockets.
int sndbuf; int sndbuf;
@ -58,6 +58,7 @@ namespace zmq
// Minimum interval between attempts to reconnect, in milliseconds. // Minimum interval between attempts to reconnect, in milliseconds.
// Default 100ms // Default 100ms
int reconnect_ivl; int reconnect_ivl;
// Maximum interval between attempts to reconnect, in milliseconds. // Maximum interval between attempts to reconnect, in milliseconds.
// Default 0 (unused) // Default 0 (unused)
int reconnect_ivl_max; int reconnect_ivl_max;

4
src/pgm_socket.cpp
View File

@ -668,10 +668,10 @@ void zmq::pgm_socket_t::process_upstream ()
int zmq::pgm_socket_t::compute_sqns (int tpdu_) int zmq::pgm_socket_t::compute_sqns (int tpdu_)
{ {
// Convert rate into B/ms. // Convert rate into B/ms.
uint64_t rate = ((uint64_t) options.rate) / 8; uint64_t rate = uint64_t (options.rate) / 8;
// Compute the size of the buffer in bytes. // Compute the size of the buffer in bytes.
uint64_t size = options.recovery_ivl * rate; uint64_t size = uint64_t (options.recovery_ivl) * rate;
// Translate the size into number of packets. // Translate the size into number of packets.
uint64_t sqns = size / tpdu_; uint64_t sqns = size / tpdu_;