Ian Barber
d485404aab
Merge pull request #626 from dkrikun/master
...
Add ZMQ_CONFLATE socket option
2013-08-20 14:37:52 -07:00
Ian Barber
cb6b5a65fc
Merge pull request #629 from ulikoehler/init_data_assert
...
Minor doc & assert fixes
2013-08-19 05:55:07 -07:00
Uli Köhler
fd8b0fec07
Re-add comment line from cmsg branch
2013-08-19 14:49:29 +02:00
Uli Köhler
a28c38efa5
Fix spaces before comments
2013-08-19 14:45:29 +02:00
danielkr
3f3777d05b
Add test for ZMQ_CONFLATE option
2013-08-19 15:34:11 +03:00
Uli Köhler
9c2740d9fa
Minor fixes to doc ; added zmq_msg_init_data() assert preventing deferred segfault
2013-08-19 14:28:28 +02:00
Ian Barber
bcfe863fd4
Merge pull request #630 from ulikoehler/cmsg
...
Optimized zmq::msg_t for constant messages
2013-08-19 01:11:07 -07:00
danielkr
da4a70d59d
Fix indentation
2013-08-19 08:18:20 +03:00
Uli Köhler
121a838a0c
Added message type for constant messages
2013-08-18 23:40:38 +02:00
Pieter Hintjens
b3ca7fd425
Merge pull request #627 from ianbarber/master
...
Attempt to fix disconnect not respecting linger
2013-08-18 00:58:03 -07:00
Pieter Hintjens
1011e8ad20
Merge pull request #624 from ricnewton/master
...
Port tests to windows and add to cmake build.
2013-08-18 00:51:39 -07:00
Ian Barber
cb35fd7bfe
Attempt to fix disconnect not respecting linger
...
Looks like linger is honoured properly, but shutting down the session
causes the pipe termination to come from that side - because the local
pipe then shuts down right away it seems to trigger a terminated on the
other end instead of waiting. This way we trigger the termination from
the local end and then terminate the session.
2013-08-18 07:50:53 +01:00
Ian Barber
ed272fe56d
Merge pull request #625 from ulikoehler/zmq_send_const
...
Add zmq_send_const for constant data
2013-08-17 23:27:17 -07:00
danielkr
f59c1a5c5a
Update doc for ZMQ_CONFLATE socket option
2013-08-17 23:55:00 +03:00
danielkr
daa7a8021f
Plug in dbuffer to serve the ZMQ_CONFLATE option
...
ZMQ_CONFLATE option is passed to pipepair() which creates a usual
ypipe_t or ypipe_conflate_t and plugs it into pipe_t under a common
abstract base.
2013-08-17 23:27:25 +03:00
danielkr
4c35b88acb
Implement double buffer for conflate option
...
Add simple double buffer implementation tailored to handle msg_t,
i.e invoke msg_t::close instead of destructor and so on.
Seems to me mutex is good enough at this point.
2013-08-17 23:22:34 +03:00
danielkr
d020dd677f
Declare ZMQ_CONFLATE option
2013-08-17 23:22:34 +03:00
danielkr
4eac7e3e4f
Add scoped_lock_t syntactic sugar
2013-08-17 23:15:16 +03:00
danielkr
87c84a252a
Add try_lock() to mutex_t
2013-08-17 23:15:16 +03:00
danielkr
503da83fce
Add #include to string.h in blob.hpp
...
Required for memmove(), memcpy()
2013-08-17 23:15:15 +03:00
Uli Köhler
e23d3963d3
Fix doc typo
2013-08-17 20:39:10 +02:00
Uli Köhler
10becae7eb
Added zmq_send_const test
2013-08-17 20:37:07 +02:00
Uli Köhler
e2c322cf80
Implemented zmq_send_const
2013-08-17 20:22:50 +02:00
Richard Newton
70a1fbee7a
Fix running tests from cmake on linux.
2013-08-17 14:39:38 +01:00
Richard Newton
e1b2b649fb
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-08-17 14:23:42 +01:00
Richard Newton
a83baa9b0b
Fix up threading code from port tests to windows.
2013-08-17 14:23:22 +01:00
Richard Newton
7f74fc7c99
Port tests to windows and add to cmake build.
2013-08-17 13:43:45 +01:00
Ian Barber
eccfede10d
Merge pull request #623 from ricnewton/master
...
Fix compile error on windows.
2013-08-08 11:42:53 -07:00
Richard Newton
e16a6af0c7
Fix compile error on windows.
2013-08-08 17:27:49 +01:00
Ian Barber
749c391b34
Merge pull request #622 from ckamm/req-strict
...
Rename ZMQ_REQ_SEND_RESETS -> ZMQ_REQ_STRICT.
2013-08-03 12:42:53 -07:00
Christian Kamm
423ca36b17
Rename ZMQ_REQ_SEND_RESETS -> ZMQ_REQ_STRICT.
...
It defaults to enabled. Switch it off to be able to send a new message
before the previous reply has been received.
2013-08-03 14:35:18 +02:00
Pieter Hintjens
fe30cc6d99
Merge pull request #619 from ckamm/req-send-resets
...
Add ZMQ_REQ_SEND_RESETS option.
2013-08-03 02:44:53 -07:00
Martin Hurton
9f4526f59a
Merge pull request #621 from hintjens/master
...
Added note to clarify policy for embedded apps
2013-07-29 06:11:03 -07:00
Pieter Hintjens
39ddc695bc
Added note about tivotisation
2013-07-29 10:42:15 +02:00
Christian Kamm
f5c59556bd
REQ: Unset reply_pipe if it terminates.
...
* Fixes a terminate() call on a dangling pointer in the SEND_RESETS
case.
* Fixes recv_reply_pipe() never receiving a message once the pipe it is
waiting on is terminated.
2013-07-29 09:35:15 +02:00
Christian Kamm
a0cc87a9d9
Add ZMQ_REQ_SEND_RESETS option.
...
This allows making a new request on a REQ socket by sending a new
message. Without the option set, calling send() after the first message
is done will continue to return an EFSM error.
It's useful for when a REQ is not getting a response. Previously that
meant creating a new socket or switching to DEALER.
2013-07-28 11:43:38 +02:00
Ian Barber
637f794193
Merge pull request #620 from ckamm/req-id
...
Add ZMQ_REQ_REQUEST_IDS option.
2013-07-26 15:41:29 -07:00
Christian Kamm
b9646f2aac
Add ZMQ_REQ_REQUEST_IDS option.
...
* Documentation:
The default behavior of REQ sockets is to rely on the ordering of messages
to match requests and responses and that is usually sufficient. When this option
is set to 1, the REQ socket will prefix outgoing messages with an extra frame
containing a request id. That means the full message is (request id, 0,
user frames...). The REQ socket will discard all incoming messages that don't
begin with these two frames.
* Behavior change: When a REQ socket gets an invalid reply, it used to
discard the message and return EAGAIN. REQ sockets still discard
invalid messages, but keep looking at the next one automatically
until a good one is found or there are no more messages.
* Add test_req_request_ids.
2013-07-26 21:38:21 +02:00
Ian Barber
6473dfd8f4
Merge pull request #617 from hurtonm/zap_updates
...
Zap updates
2013-07-18 03:26:21 -07:00
Martin Hurton
4a5358f4d0
Implement ZAP for NULL mechanism
2013-07-18 10:59:39 +02:00
Martin Hurton
53bc53da04
Update PLAIN mechanism to the latest ZAP revision
2013-07-18 10:59:34 +02:00
Martin Hurton
d65231be1c
Update CURVE mechanism to the latest ZAP revision
2013-07-18 10:59:31 +02:00
Martin Hurton
7541debe6d
Add get_peer_ip_address utility function
...
The functon returns string representation of peer's
IP address. We will need this to update ZAP implementation.
2013-07-18 10:41:31 +02:00
Ian Barber
4944095262
Merge pull request #615 from hintjens/master
...
Last step in test_spec_req is still failing; disabled it.
2013-07-15 00:15:55 -07:00
Pieter Hintjens
1068bc0795
Merge pull request #616 from steve-o/master
...
Add static libraries to CMake, minor housekeeping.
2013-07-14 14:48:17 -07:00
Steven McCoy
409721b9d2
Add CMake support for static libraries.
2013-07-14 13:58:46 -04:00
Steven McCoy
21fe600848
Move CMake dependencies together.
2013-07-14 13:36:30 -04:00
Steven McCoy
ae86c56d74
README file moved to GitHub format and extension, drop from packaging and default to NEWS file for popup.
2013-07-14 13:26:55 -04:00
Pieter Hintjens
d46c2ee2fc
Disabled last step in test_spec_req so build can complete
2013-07-14 13:04:31 +02:00
Pieter Hintjens
4fb004f59b
Merge pull request #614 from ckamm/fix-spec-req-fail
...
Fix intermittent failure in test_spec_req.
2013-07-14 03:00:06 -07:00