diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-10-06 13:12:49 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-10-06 13:12:49 +0200 |
commit | d31792e652cc9fd3bc84e2abd89f232d273b7ede (patch) | |
tree | a9e77563aa6b470987f080017ee1e8d2664a670b | |
parent | f5f1a8b1841f04fc9db5df3eb669d76513687065 (diff) |
Default HWMs are set to 1000
This patch is meant to prevent users from running out of memory
when using 0MQ in the default configuration.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r-- | doc/zmq_getsockopt.txt | 8 | ||||
-rw-r--r-- | doc/zmq_setsockopt.txt | 8 | ||||
-rw-r--r-- | src/options.cpp | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index ba85ab3..99065c0 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -81,12 +81,10 @@ blocking or dropping sent messages. Refer to the individual socket descriptions in linkzmq:zmq_socket[3] for details on the exact action taken for each socket type. -The default 'ZMQ_SNDHWM' value of zero means "no limit". - [horizontal] Option value type:: int Option value unit:: messages -Default value:: 0 +Default value:: 1000 Applicable socket types:: all @@ -103,12 +101,10 @@ blocking or dropping sent messages. Refer to the individual socket descriptions in linkzmq:zmq_socket[3] for details on the exact action taken for each socket type. -The default 'ZMQ_RCVHWM' value of zero means "no limit". - [horizontal] Option value type:: int Option value unit:: messages -Default value:: 0 +Default value:: 1000 Applicable socket types:: all diff --git a/doc/zmq_setsockopt.txt b/doc/zmq_setsockopt.txt index b06388c..fd004f4 100644 --- a/doc/zmq_setsockopt.txt +++ b/doc/zmq_setsockopt.txt @@ -38,12 +38,10 @@ blocking or dropping sent messages. Refer to the individual socket descriptions in linkzmq:zmq_socket[3] for details on the exact action taken for each socket type. -The default 'ZMQ_SNDHWM' value of zero means "no limit". - [horizontal] Option value type:: int Option value unit:: messages -Default value:: 0 +Default value:: 1000 Applicable socket types:: all @@ -60,12 +58,10 @@ blocking or dropping sent messages. Refer to the individual socket descriptions in linkzmq:zmq_socket[3] for details on the exact action taken for each socket type. -The default 'ZMQ_RCVHWM' value of zero means "no limit". - [horizontal] Option value type:: int Option value unit:: messages -Default value:: 0 +Default value:: 1000 Applicable socket types:: all diff --git a/src/options.cpp b/src/options.cpp index 89cf429..8a3e527 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -24,8 +24,8 @@ #include "err.hpp" zmq::options_t::options_t () : - sndhwm (0), - rcvhwm (0), + sndhwm (1000), + rcvhwm (1000), affinity (0), rate (100), recovery_ivl (10000), |