3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2278 from bluca/msg_t_size_draft

Browse Source
This commit is contained in:
Constantin Rack 2016-12-29 21:48:39 +01:00 committed by GitHub
commit 64b07d8132
5 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
NEWS
View File

@ -1,9 +1,33 @@
0MQ version 4.2.1 stable, released on 201x/xx/xx
=============================================
* New Context options:
* New DRAFT (see NEWS for 4.2.0) Context options:
- ZMQ_MSG_T_SIZE
* Fixed #2268 - improved compatibility with mingw32
* Fixed #2254 - ZMQ_PUB compatibility with libzmq 2.x broken
* Fixed #2245 - added support for VS2017, Windows SDK 10.0.14393.0, toolset v141
* Fixed #2242 - file descriptors leaks on fork+exec
* Fixed #2239 - retired poller item crash from reaper thread
* Fixed #2234 - improved compatibility with AIX 7.1
* Fixed #2225 - cannot pick select for poller
* Fixed #2217 - CMake build uses library version as the ABI version
* Fixed #2208 - added support for ZMQ_TOS on IPv6
* Fixed #2200 - no documentation for ZMQ_SOCKS_PROXY
* Fixed #2199 - no documentation for zmq_curve_public
* Fixed #2196 - fixed build and runtime errors on kFreeBSD
0MQ version 4.2.0 stable, released on 2016/11/04
=============================================

1
doc/zmq_ctx_get.txt
View File

@ -62,6 +62,7 @@ ZMQ_MSG_T_SIZE: Get the zmq_msg_t size at runtime
The 'ZMQ_MSG_T_SIZE' argument returns the size of the zmq_msg_t structure at
runtime, as defined in the include/zmq.h public header.
This is useful for example for FFI bindings that can't simply do a sizeof().
NOTE: in DRAFT state, not yet available in stable releases.
RETURN VALUE

8
include/zmq.h
View File

@ -213,9 +213,6 @@ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
#define ZMQ_THREAD_PRIORITY 3
#define ZMQ_THREAD_SCHED_POLICY 4
#define ZMQ_MAX_MSGSZ 5
// All options after this is for version 4.3 and still *draft*
// Subject to arbitrary change without notice
#define ZMQ_MSG_T_SIZE 6
/* Default for new contexts */
#define ZMQ_IO_THREADS_DFLT 1
@ -371,8 +368,6 @@ ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
#define ZMQ_VMCI_BUFFER_MAX_SIZE 87
#define ZMQ_VMCI_CONNECT_TIMEOUT 88
#define ZMQ_USE_FD 89
// All options after this is for version 4.3 and still *draft*
// Subject to arbitrary change without notice
/* Message options */
#define ZMQ_MORE 1
@ -566,6 +561,9 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
#define ZMQ_SCATTER 17
#define ZMQ_DGRAM 18
/* DRAFT Context options */
#define ZMQ_MSG_T_SIZE 6
/* DRAFT Socket methods. */
ZMQ_EXPORT int zmq_join (void *s, const char *group);
ZMQ_EXPORT int zmq_leave (void *s, const char *group);

3
src/zmq_draft.h
View File

@ -46,6 +46,9 @@
#define ZMQ_SCATTER 17
#define ZMQ_DGRAM 18
/* DRAFT Context options */
#define ZMQ_MSG_T_SIZE 6
/* DRAFT Socket methods. */
int zmq_join (void *s, const char *group);
int zmq_leave (void *s, const char *group);

2
tests/test_ctx_options.cpp
View File

@ -48,7 +48,9 @@ int main (void)
#endif
assert (zmq_ctx_get (ctx, ZMQ_IO_THREADS) == ZMQ_IO_THREADS_DFLT);
assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 0);
#if defined (ZMQ_BUILD_DRAFT_AP)
assert (zmq_ctx_get (ctx, ZMQ_MSG_T_SIZE) == sizeof (zmq_msg_t));
#endif
rc = zmq_ctx_set (ctx, ZMQ_IPV6, true);
assert (zmq_ctx_get (ctx, ZMQ_IPV6) == 1);