generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity
1,894 Commits 4 Branches 39 Tags 40 MiB
f718d2bead
Commit Graph

1894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jos Decoster
85c19f1269 added missing files to MSVC10 solution file: tcp.cpp, tcp.hpp 2012-06-19 17:05:15 +02:00
jdc8
98ee759dad Added missing semi-colon. 2012-06-19 09:37:06 -04:00
Pieter Hintjens
eb16f6b88e Merge pull request #384 from steve-o/err-handler 
Add errno fallback values for MSVC2008.
 2012-06-18 22:34:40 -07:00
Steven McCoy
5b3d0c633d Add errno fallback values for MSVC2008. 2012-06-18 17:13:17 -04:00
Ian Barber
7bbccdeac9 Merge pull request #383 from Kobolog/master 
Reworked ZMQ_FAIL_UNROUTABLE to actually work as it was intended.
 2012-06-17 00:36:58 -07:00
Kobolog
08749c8e7b Removed an unneeded include in tests 2012-06-17 02:38:15 +04:00
Kobolog
6da48aed3a Fixed tests 2012-06-17 02:36:08 +04:00
Kobolog
829d0003be Verbose ROUTER socket behavior patch 2012-06-17 02:33:43 +04:00
Pieter Hintjens
21eb8c8fa5 Merge pull request #382 from hurtonm/master 
Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error
 2012-06-16 12:53:11 -07:00
Martin Hurton
7d99129411 Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error 2012-06-16 21:46:20 +02:00
Pieter Hintjens
7753379eab Merge pull request #381 from hurtonm/connecter_cleanups 
Connecter cleanups
 2012-06-14 23:09:59 -07:00
Martin Hurton
919bd9628d {tcp|ipc}_connecter: check whether socket is valid before closing it 
Calling close () when the underlying socket is invalid
triggers an assertion failure.
 2012-06-15 02:38:47 +02:00
Martin Hurton
ec9f8994a7 Simplify {tcp|ipc}_connecter 
Make start_connecting () to have singe exit point.
 2012-06-15 02:03:20 +02:00
Martin Hurton
e0fed9d29a Simplify {tcp|ipc}_connecter 
The patch is meant to make the code easier to understand.
The 'wait' attribute is replaced by 'delayed_start'
and 'timer_started' attributes. The former is constant and
is initialized in the constructor. The latter is a flag
reflecting whether a timer has been started and changes during
the lifetime of the object.
 2012-06-15 01:55:13 +02:00
Pieter Hintjens
c8d0d68471 Merge pull request #380 from jlopex/master 
current libzmq not compiling with android NDK
 2012-06-14 12:17:51 -07:00
Javier Lopez
eb6c668c2a libzmq3.x not compiling on Android crosscompiler 
- Android crosscompiler shows a warning about two signed/unsigned checks
  on compilation, this patch adds casts to avoid this, so zmq3.x can
  compile on it.
 2012-06-14 12:14:55 -07:00
Ian Barber
67ab3390ec Merge pull request #379 from hitenp/doc-changes 
Correct typo: add missing single quote.
 2012-06-14 02:55:32 -07:00
Hiten P
a96dcfb29a Correct typo: add missing single quote. 2012-06-14 10:52:44 +01:00
Pieter Hintjens
426ea71697 Merge pull request #378 from steve-o/err-handler 
Fix #LIBZMQ-329 assertion on WSAEACCES
 2012-06-13 16:45:48 -07:00
Steven McCoy
acbb99383f Add additional Windows Sockets Error Codes. 2012-06-13 19:42:11 -04:00
Pieter Hintjens
f35bed0edc Merge pull request #377 from hurtonm/master 
{tcp|ipc}_listener: close socket when set_address () fails
 2012-06-13 06:09:42 -07:00
Martin Hurton
75d67286cc {tcp|ipc}_listener: close socket when set_address () fails 2012-06-13 14:49:43 +02:00
Pieter Hintjens
a9507cc267 Merge pull request #376 from ianbarber/master 
Add unistd header to test
 2012-06-13 04:20:04 -07:00
Ian Barber
c7c834a945 Add unistd header to test_connect_delay header 
For sleep and usleep
 2012-06-13 12:18:22 +01:00
Pieter Hintjens
dc9749fc67 Merge pull request #375 from ianbarber/master 
Add newline to end of new test file
 2012-06-13 00:04:13 -07:00
Ian Barber
35c55a2cde Add newline to end of test_connect_delay file 2012-06-13 07:47:18 +01:00
Pieter Hintjens
9e1e68ef16 Merge pull request #374 from steve-o/branding 
Add ZeroMQ branding.
 2012-06-12 23:15:11 -07:00
Steven McCoy
b2e56c5e4f Add ZeroMQ branding. 2012-06-12 21:30:24 -04:00
Pieter Hintjens
076e081de2 Merge pull request #373 from ianbarber/master 
Add ZMQ_DELAY_ATTACH_ON_CONNECT sockopt
 2012-06-12 14:18:51 -07:00
Pieter Hintjens
e1cc2d4a41 Merge pull request #372 from ianbarber/manfix 
Update bind and connect documentation for clarity
 2012-06-12 12:26:20 -07:00
Ian Barber
bc9ae715c3 Add asserts and rename pipe set 
Rename the pipeset to terminating_pipes, as suggested by Martin H. Adds
asserts to test the pipe is contained in the terminating set where
appropriate.
 2012-06-12 17:56:39 +01:00
Ian Barber
704b952274 Add reference to the inproc documentation 
The previous note in connect introduced but did not elaborate on the
requirement to bind before connect in inproc. As that discussion is in
detail in the inproc docs link to there.
 2012-06-12 15:49:18 +01:00
Ian Barber
7b78ed9d60 Update bind and connect documentation for clarity 
Based on discussion with Steve O on the list, make the difference
between bind and connect usage more clear, and add a note reflecting the
fact that inproc must have bind before connect to reinforce the
information in zmq_inproc.
 2012-06-12 15:46:26 +01:00
Ian Barber
e5904e63ce Allow blocking while connect() is completing 
This patch, salvaged from a trainwreck accidental merge earlier, adds a
new sockopt, ZMQ_DELAY_ATTACH_ON_CONNECT which prevents a end point
being available to push messages to until it has fully connected, making
connect work more like bind. This also applies to reconnecting sockets,
which may cause message loss of in-queue messages, so it is sensible to
use this in conjunction with a low HWM and potentially an alternative
acknowledgement path.

Notes on most of the individual commits can be found the repository log.
 2012-06-12 15:34:48 +01:00
Ian Barber
409d5e8fff Allow blocking while connect() is completing 
This patch, salvaged from a trainwreck accidental merge earlier, adds a
new sockopt, ZMQ_DELAY_ATTACH_ON_CONNECT which prevents a end point
being available to push messages to until it has fully connected, making
connect work more like bind. This also applies to reconnecting sockets,
which may cause message loss of in-queue messages, so it is sensible to
use this in conjunction with a low HWM and potentially an alternative
acknowledgement path.

Notes on most of the individual commits can be found the repository log.
 2012-06-12 15:31:23 +01:00
Ian Barber
95cbad3841 Revert "After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost." 
This reverts commit fe3fb419fe.
 2012-06-12 14:53:57 +01:00
Ian Barber
a563d494bb Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word" 
This reverts commit b79aaaf473.
 2012-06-12 14:53:38 +01:00
Ian Barber
cc230cfe60 Revert "And another typo on the same comment" 
This reverts commit 297af95451.
 2012-06-12 14:52:38 +01:00
Ian Barber
5b167aa896 Revert "Remove the extra outpipe handling as the session is quite capable of delaying the creation of the pipe until the connection has happened. Simply don't build the pipe, and let it do that automatically." 
This reverts commit 06485d9200.
 2012-06-12 14:52:18 +01:00
Ian Barber
81b8362a59 Revert "Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking." 
This reverts commit 6f6466f088.
 2012-06-12 14:51:50 +01:00
Ian Barber
48d3977632 Revert "Fix condition so that PGM and EPGM sockets always create pipes immediately, even if delay_attach_on_connect is set. This allows passing through the icanhasall flag, and is realistic given the fact those protocols should be able to connect immediately" 
This reverts commit b5ace39e2a.
 2012-06-12 14:51:33 +01:00
Ian Barber
6c382c5c61 Revert "Fix whitespace in test" 
This reverts commit 0b3478d6ec.
 2012-06-12 14:51:19 +01:00
Ian Barber
72bae207a3 Revert "Rebinding on reconnection to allow for the pipe blocking will set the event sink again, which will cause an assert to be triggered. I have modified that to allow for setting the same sink to be OK. I believe this should be ok - on termination, if a pipe hasn't reconnected, it would just attempt to be erased from the pipes list again, which is reasonable" 
This reverts commit 1566091bc6.
 2012-06-12 14:51:05 +01:00
Ian Barber
f0920caf02 Revert "On the advice of Martin Hurton, removed the new command type and just terminated the pipe in a reconnect situation, and notified the socket of the same. This handles the blocking properly, but at the cost of potentially losing in flight messages. However, this is a reasonable trade off given how much simpler it makes the patch." 
This reverts commit c13f1d52ff.
 2012-06-12 14:50:50 +01:00
Ian Barber
b020bd4ba8 Revert "Remove unnecessary extra test in pipe assertion - now we are terminating pipes we don't need to allow the case in which a pipe is rebound to the same sink" 
This reverts commit 29f8d9ca15.
 2012-06-12 14:49:44 +01:00
Ian Barber
956cfd9f75 Revert "Fix incorrect whitespace in if statement" 
This reverts commit 55cbdfcf26.
 2012-06-12 14:49:21 +01:00
Ian Barber
74175decb4 Revert "Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation." 
This reverts commit ace7c99b91.
 2012-06-12 14:48:24 +01:00
Ian Barber
440af0022d Revert "Restoring comment for clarity" 
This reverts commit 09956dee93.
 2012-06-12 14:48:00 +01:00
Ian Barber
8968b294e0 Revert "When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types" 
This reverts commit 5008f385ba.
 2012-06-12 14:47:27 +01:00
Ian Barber
836fa4b7ca Revert "The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe" 
This reverts commit 336f72720a.
 2012-06-12 14:47:10 +01:00