Skip to content

Conversation

@revans2
Copy link

@revans2 revans2 commented Sep 11, 2013

This is pulling in a fix from upstream. It looks a lot bigger then it is because I had to rerun autoconf, and that changed a lot of files. The files you actually want to look at can be seen here

zeromq/libzmq@7c0c798

I also had to put in a small bridge between the bool _block in mailbox and the int _timeout that the new code expects. I did this based off of the code in

zeromq/libzmq@d7923f0

where block was changed to a -1 and non-block was set to 0.

Storing commands in OS socket buffers caused whole lot of
problems when free space in the buffer ran out. This patch
stores commands in ypipes instead and uses socketpair just
to signal the other thread, ie. at most one byte is stored
in the socketpair at any single instant.

Signed-off-by: Martin Sustrik sustrik@250bpm.com

Conflicts:
src/config.hpp
src/mailbox.cpp
src/mailbox.hpp

Storing commands in OS socket buffers caused whole lot of
problems when free space in the buffer ran out. This patch
stores commands in ypipes instead and uses socketpair just
to signal the other thread, ie. at most one byte is stored
in the socketpair at any single instant.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

Conflicts:
	src/config.hpp
	src/mailbox.cpp
	src/mailbox.hpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants