3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,036 Commits 4 Branches 39 Tags
Commit Graph

68 Commits

Author SHA1 Message Date
Martin Hurton
e51a1f04c9 session_base: code cleanup 
- add unlikely hints
- drop unnecessary assertion
- style fixes

There is no need to require the 'more' flag in the provided message
structure be 0 when pulling message from the session.
 2012-11-07 01:07:51 +01:00
Martin Hurton
9d8eb1f9b9 Style fixes 2012-10-30 12:18:30 +01:00
Hardeep
83387b4073 Added support for non-zmq tcp client connections to router socket. 
- Created a new option ZMQ_ROUTER_RAW_SOCK
    - Added new raw_encoder and raw_decoder to receive and send messages in raw form to remote client
    - Added test case file tests/test_raw_sock.cpp

    o To create a raw router sock set the ZMQ_ROUTER_RAW_SOCK option
    o ZMQ_MSGMORE flag is ignored for non-id messages
    o To terminate a remote connection send id message followed by zero length data message
 2012-10-29 00:03:36 -07:00
Martin Hurton
4824237761 Resolve LIBZMQ-417 
Ref: https://zeromq.jira.com/browse/LIBZMQ-417
 2012-10-25 09:13:09 +02:00
Pieter Hintjens
4ba34c9d70 Whitespace and style fixes 2012-10-24 09:18:52 +09:00
Lourens Naudé
759d453368 Significantly reworked the monitoring infrastructure with a more granular per socket API and to play well with monitoring endpoints in application threads 2012-09-21 12:53:31 +01:00
Martin Hurton
dfc0222ee6 Decouple encoder_t and decoder_t from session_base_t 
This patch introduces i_msg_sink and i_msg_source interfaces. This
allows us to make message encoder and decoder more general.
 2012-09-02 22:46:26 +02:00
Arthur O'Dwyer
3b984d40e9 Silence all "unused parameter" warnings from Clang. 
Compiling without warnings is a good goal, because it makes
new warnings (which probably indicate bugs) stand out rather
than getting lost in the spam.

My fixes fall into two categories:

    - Adding (void) casts of unused parameters, where their
      unusedness seems like a TODO (or in some cases a bug?).

    - Removing parameter names altogether, where the function
      is clearly a stub that will never use its parameters.

Should be no change in behavior.
 2012-08-27 16:05:51 -07:00
Arthur O'Dwyer
7fadd708a0 Fix monitor_event() to work at all. 
There are three versions of monitor_event(), all taking
variadic arguments. The original code just has the first one
creating a va_list and passing that va_list variadically to
the second one... which creates a new va_list and passes it
variadically to the third one... and of course everything
blows up when we try to pull a non-va_list argument off the
stack.

The correct approach matches the C standard library's use
of printf/vprintf, scanf/vscanf, and so on. Once you make
a va_list, you must pass it only to functions which expect
a va_list parameter.
 2012-08-24 16:42:31 -07:00
Martin Hurton
1ab85f471a Exchange greeting messages for all socket types 
Fixes #415.
 2012-08-11 19:04:49 +02:00
Lourens Naudé
9dc248f6ab Fix invalid address metadata for ZMQ_EVENT_DISCONNECTED 2012-08-04 11:41:33 +01: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
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
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 fe3fb419fe249d7015a6c864d18464d434a55468.
 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 b79aaaf473c4ef61bbd45e711d48fceb06dc9ad1.
 2012-06-12 14:53:38 +01:00
Ian Barber
cc230cfe60 Revert "And another typo on the same comment" 
This reverts commit 297af954514d9b2097c5e2df980bbe16dd72e761.
 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 06485d9200ac697896dc4bd162fa4f8b4c2ddaf6.
 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 6f6466f0884a169fd25a48195dd9a4e2135818e6.
 2012-06-12 14:51:50 +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 c13f1d52ff9ed51a651ad8bcc9379e82d9318e86.
 2012-06-12 14:50:50 +01:00
Ian Barber
956cfd9f75 Revert "Fix incorrect whitespace in if statement" 
This reverts commit 55cbdfcf261b41f6a9b71bb26ce7336da7f73eec.
 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 ace7c99b917dd66f1fcaed3cbb50c988b7e33b09.
 2012-06-12 14:48:24 +01:00
Ian Barber
440af0022d Revert "Restoring comment for clarity" 
This reverts commit 09956dee939a06c0734004aa3f39c491ec49c6f8.
 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 5008f385bab2dd89c68d7ff93e0c5b303c6043e8.
 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 336f72720a99195942ced5c6aad2bb8e0baa3f32.
 2012-06-12 14:47:10 +01:00
Ian Barber
2c6f26153e Revert "Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment" 
This reverts commit b84b007981d9247bcc7bd000e4aeb56baed56de2.
 2012-06-12 14:46:38 +01:00
Ian Barber
3ae68d67a4 Revert "Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues." 
This reverts commit 67497a26439239fdb95652b46d7e4e41fe672b31.
 2012-06-12 14:46:23 +01:00
Ian Barber
c9926f6f24 Revert "As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion." 
This reverts commit a5f7300da6aa2224638fc932fe5ca3624189b1c1.
 2012-06-12 14:45:14 +01:00
Ian Barber
19da88be67 Revert "Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown." 
This reverts commit a90c1db7d2c0d32f9a0177d46502505efac654a5.
 2012-06-12 14:44:41 +01:00
Ian Barber
eb14890d23 Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq"" 
This reverts commit 029d3dfae2c2bf9e10c7f05d78593f481569bbd7.
 2012-06-12 14:43:18 +01:00
Ian Barber
029d3dfae2 Revert "Merge branch 'master' of github.com:ianbarber/libzmq" 
This reverts commit 33459029793474d14cdb48f85ad2c58dc7ed156f, reversing
changes made to 889b0e6f29f0cce566339b13b8a44f3b97836b6e.
 2012-06-12 14:13:17 +01:00
Ian Barber
6117a2b099 Revert "Replace incomplete count with a std::set" 
This reverts commit 4aa5ba3d119b98c8f1e4e682a6ee7c57d460cc55.
Unintentional merge
 2012-06-12 14:07:54 +01:00
Ian Barber
4aa5ba3d11 Replace incomplete count with a std::set 
This commit removes the countdown flag and adds a set to store the pipes
that are currently being disconnected.
 2012-06-12 12:13:21 +01:00
Ian Barber
a90c1db7d2 Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown. 2012-06-11 07:58:59 +01:00
Ian Barber
a5f7300da6 As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion. 2012-06-10 19:57:02 +01:00
Ian Barber
67497a2643 Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues. 2012-06-08 23:55:42 +01:00
Ian Barber
b84b007981 Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment 2012-06-06 23:12:56 +01:00
Ian Barber
336f72720a 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 2012-06-05 21:44:23 +01:00
Ian Barber
5008f385ba 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 2012-06-05 18:41:38 +01:00
Ian Barber
09956dee93 Restoring comment for clarity 2012-06-04 11:41:20 +01:00
Ian Barber
ace7c99b91 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. 2012-06-04 11:40:14 +01:00
Ian Barber
55cbdfcf26 Fix incorrect whitespace in if statement 2012-06-04 10:31:30 +01:00
Ian Barber
c13f1d52ff 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. 2012-06-04 10:27:16 +01:00
Ian Barber
6f6466f088 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. 
It didn't seem straightforward to use any of the existing process calls, so I have added a new command to command_t and friends called detach. This instructs the socket_base to remove the pipe from it's pipe list. The session base stores a copy of the outpipe, and will resend the bind command on reconnection. This should allow balancing again.
 2012-06-03 22:57:47 +01:00
Ian Barber
06485d9200 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. 2012-06-03 22:05:36 +01:00
Ian Barber
297af95451 And another typo on the same comment 2012-06-03 21:38:41 +01:00
Ian Barber
b79aaaf473 Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word 2012-06-03 21:34:41 +01:00
Ian Barber
fe3fb419fe 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 patch adds a sockopt ZMQ_DELAY_ATTACH_ON_CONNECT, which if set to 1 will attempt to preempt this behavior. It does this by extending the use of the session_base to include in the outbound as well as the inbound pipe, and only associates the pipe with the socket once it receives the connected callback via a process_attach message. This works, and a test has been added to show so, but may introduce unexpected complications. The shutdown logic in this class has become marginally more awkward because of this, requiring the session to serve as the sink for both pipes if shutdown occurs with a still-connecting pipe in place. It is also possible there could be issues around flushing the messages, but as I could not directly think how to create such an issue I have not written any code with regards to that.

The documentation has been updated to reflect the change, but please do check over the code and test and review.
 2012-06-01 17:58:19 +01:00
Martin Hurton
7fe45af30f Fix issue #370 
The patch extends the internal session's API with the reset method.
This method is used to reset a session's state so that it can
handle a new connection.
 2012-05-29 22:10:51 +02:00
Martin Hurton
24b79c7e0b Prefer errno_assert/alloc_assert to zmq_assert 2012-05-28 23:17:03 +02:00
Martin Hurton
130dfc5b5f Fix issue #369 
The bug was that after reconnect, the session did not
handle identity messages properly.
 2012-05-28 17:08:27 +02:00