Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problems: DRAFT build broken in CentOS 6, missing bits in documentation #2791

Merged
merged 4 commits into from
Oct 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/zmq_ctx_set.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Default value:: -1


ZMQ_THREAD_NAME_PREFIX: Set name prefix for I/O threads
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The 'ZMQ_THREAD_NAME_PREFIX' argument sets a numeric prefix to each thread
created for the internal context's thread pool. This option is only supported on Linux.
This option is useful to help debugging done via "top -H" or "gdb"; in case
Expand Down
3 changes: 2 additions & 1 deletion doc/zmq_proxy_steerable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ If the control socket is not NULL, the proxy supports control flow. If
'PAUSE' is received on this socket, the proxy suspends its activities. If
'RESUME' is received, it goes on. If 'TERMINATE' is received, it terminates
smoothly. If 'STATISTICS' is received, the proxy will reply on the control socket
sending 8 unsigned integers 64-bit wide that provide the
sending a multipart message with 8 frames, each with an unsigned integer 64-bit
wide that provide in the following order:
- number of messages received by the frontend socket
- number of bytes received by the frontend socket
- number of messages sent out the frontend socket
Expand Down
12 changes: 6 additions & 6 deletions tests/test_router_mandatory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ void test_get_peer_state ()
rc = zmq_poller_add (poller, dealer1, NULL, ZMQ_POLLIN);
assert (rc == 0);

const size_t count = 10000;
const size_t event_size = 2;
const unsigned int count = 10000;
const unsigned int event_size = 2;
bool dealer2_blocked = false;
size_t dealer1_sent = 0, dealer2_sent = 0, dealer1_received = 0;
unsigned int dealer1_sent = 0, dealer2_sent = 0, dealer1_received = 0;
zmq_poller_event_t events[event_size];
for (size_t iteration = 0; iteration < count; ++iteration) {
for (unsigned int iteration = 0; iteration < count; ++iteration) {
rc = zmq_poller_wait_all (poller, events, event_size, -1);
assert (rc != -1);
for (size_t event_no = 0; event_no < event_size; ++event_no) {
for (unsigned int event_no = 0; event_no < event_size; ++event_no) {
const zmq_poller_event_t &current_event = events[event_no];
if (current_event.socket == router
&& current_event.events & ZMQ_POLLOUT) {
Expand All @@ -158,7 +158,7 @@ void test_get_peer_state ()
// never read from dealer2, so its pipe becomes full eventually
}
}
printf ("dealer1_sent = %zu, dealer2_sent = %zu, dealer1_received = %zu\n",
printf ("dealer1_sent = %u, dealer2_sent = %u, dealer1_received = %u\n",
dealer1_sent, dealer2_sent, dealer1_received);
assert (dealer2_blocked);
zmq_poller_destroy (&poller);
Expand Down
1 change: 1 addition & 0 deletions tests/test_timers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#define __STDC_LIMIT_MACROS // to define SIZE_MAX with older compilers
#include "testutil.hpp"

void handler (int timer_id, void* arg)
Expand Down