0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-02 19:35:29 +08:00

2506 Commits

Author SHA1 Message Date
Ian Barber
fb45685aa8 Merge pull request #521 from SRombauts/master
Static Library Linking for Windows
2013-02-24 09:04:26 -08:00
Sebastien Rombauts
0ecc96bf33 Adding missing new ZeroMQ_Static.props and Static.props files
+ ignore StaticRelease & StaticDebug intermediate files
2013-02-24 16:17:20 +01:00
Sebastien Rombauts
b3bcd8e323 Static Library Linking for Windows
- New ZMQ_STATIC flag to enable "libzmq.lib" Windows static library (or "libzmq_d.lib" in Debug mode).
- ZMQ_STATIC needs also to be defined by projects using static linking against "libzmq.lib"
- New StaticDebug & StaticRelease configurations for libzmq Win32 projects under MSVC 2008 & 2010
- Tested with Visual Studio 2008 Express under Windows 7, and Visual Studio 2010 Express under Windows 8.
2013-02-24 15:44:14 +01:00
Pieter Hintjens
0434366088 Merge pull request #520 from xantares/master
Fixed module path with cmake < 2.8.3
2013-02-22 00:27:56 -08:00
Michel Zou
d17567626a Fixed module path with cmake < 2.8.3 2013-02-22 09:01:41 +01:00
Ian Barber
25dc715b7b Merge pull request #519 from SRombauts/master
Corrected linking error in MSVC 2010 build + perf/projects compilation
2013-02-20 11:45:14 -08:00
Ian Barber
897023c3c1 Merge pull request #518 from hintjens/master
Fixed MAXMSGSIZE setsockopt, which I'd broken
2013-02-20 11:44:22 -08:00
Sébastien Rombauts
a61535a23a VS2008 & VS2010: adding the pre-build command to copy platform.hpp in perf/ directory to the two appropriate projects, for each MSVC version 2013-02-20 16:08:18 +01:00
Pieter Hintjens
a85c9f45d1 MAXMSGSIZE broke when I cleaned up this code - fixed 2013-02-20 14:05:55 +01:00
Sébastien Rombauts
157bf4523e VS2010: adding another pre-build command to copy platform.hpp in perf/ directory 2013-02-19 22:16:40 +01:00
Sébastien Rombauts
23db53d0aa Corrected linking error in MSVC 2010 build
- raw_encoder.cpp and raw_decoder.cpp where missing in Visual Studio 2010 project
2013-02-19 22:01:50 +01:00
Pieter Hintjens
ccf2b9b466 Merge pull request #517 from SRombauts/master
Windows CE support : using standard _WIN32_WCE flag instead of WINCE
2013-02-19 10:31:26 -08:00
Sébastien Rombauts
57f84d6811 Windows CE support : some more #if !defined _WIN32_WCE
- Windows CE does not manage security attributes (no SetSecurityDescriptorDacl(), SetEvent (NULL, xxx) ...)
- Windows CE does not inheritance of sockets for child process (SetHandleInformation ((HANDLE) *w_, HANDLE_FLAG_INHERIT...)
- see comments about story "Porting ZeroMQ to Windows Mobile" on webpage http://www.zeromq.org/story:5
2013-02-19 18:57:12 +01:00
Sébastien Rombauts
05bb0ead54 Windows CE support : uncommenting #define EACCES needed
- tested for Windows CE 5.0 under Visual Studio 2008 Pro
- tested for Windows XP under Visual Studio 2008 Pro
2013-02-19 18:55:01 +01:00
Sébastien Rombauts
41d79bc19e Windows CE support : using standard _WIN32_WCE flag instead of WINCE
- when compiling for Windows CE, a C++ project must define the preprocessor definitions: UNDER_CE=$(CEVersion),_WIN32_WCE=$(CEVersion)
- choosing the "_WIN32_CE" form for uniformization with "_WIN32" and "_WIN32_WINNT" already used in libzmq (boost is using both forms)
- see http://msdn.microsoft.com/en-us/library/ee479161(v=winembedded.60).aspx
2013-02-19 16:49:23 +01:00
Pieter Hintjens
a5ef50141c Merge pull request #516 from SRombauts/master
Corrected some more linking errors in MSVC build
2013-02-19 05:33:42 -08:00
Sébastien Rombauts
927000fe2f Fixed 7 MSVC2008 Compiler Warning (level 3) C4800: 'const int' : forcing value to bool 'true' or 'false' (performance warning)
- added explicit test "(xxx != 0)" to get a "bool" value out of the "int" expression
- see the MSDN recommandation http://msdn.microsoft.com/en-us/library/b6801kcy(v=vs.90).aspx
2013-02-19 14:27:14 +01:00
Sébastien Rombauts
42be4d13a7 Corrected more linking error in MSVC build
- raw_encoder.cpp and raw_decoder.cpp in missing in MSVC project
2013-02-19 13:46:52 +01:00
Ian Barber
a8dfcb3c7d Merge pull request #515 from hintjens/master
Updated NEWS for 3.2.2 stable
2013-02-18 12:19:11 -08:00
Pieter Hintjens
e628421ed5 Updated NEWS for 3.2.2 stable 2013-02-18 21:14:14 +01:00
Pieter Hintjens
08be168dd0 Merge pull request #514 from pijyoi/fixcs
release critical section on failure to create signaler fdpair
2013-02-15 08:44:30 -08:00
KIU Shueng Chuan
8c71ac47e8 release critical section on failure to create signaler fdpair 2013-02-15 10:45:43 +08:00
Ian Barber
7094a70612 Merge pull request #513 from hintjens/master
Fixed test_connect_resolve
2013-02-10 01:23:13 -08:00
Pieter Hintjens
51cfcb117a Some DNSs will resolve ANY domain name so I made more reliable errors. 2013-02-10 08:39:27 +01:00
Ian Barber
9a6b875f21 Merge pull request #512 from montoyaedu/master
broken tests compilation. Makefile.am
2013-02-07 04:23:56 -08:00
montoyaedu
1a13554fe0 solved broken tests compilation 2013-02-07 12:27:33 +01:00
Pieter Hintjens
6b2304ad97 Merge pull request #511 from mjasperse/patch-2
Corrected linking error in MSVC build
2013-02-05 15:13:12 -08:00
mjasperse
ec04ccba79 Corrected linking error in MSVC build
MSVC build fails with linking errors for unresolved symbols SetSecurityDescriptorDacl and InitializeSecurityDescriptor in signaler.obj
Adding the relevant link library (Advapi32.lib) to VCLinkerTool fixes this (tested MSVC2010 on XP and Win7)
2013-02-06 10:09:07 +11:00
Pieter Hintjens
f27eb67e1a Merge pull request #510 from miniway/master
LIBZMQ-497 there could be unsent bytes in encoder
2013-02-01 00:54:36 -08:00
Min(Dongmin Yu)
2c1a3c55f7 LIBZMQ-497 there could be unsent bytes in encoder
When we send a large message, the message can be splitted into two chunks.
One is in the encoder buffer and the other is the zero-copy pointer.
The session could get the term before the last chunk is sent.
2013-02-01 17:32:28 +09:00
Chuck Remes
a3ae0d4c16 Merge pull request #509 from hintjens/master
Added IPv6 option to context
2013-01-31 13:40:02 -08:00
Pieter Hintjens
8ab3c4a1bf Fixed issue #500 2013-01-31 21:52:30 +01:00
Chuck Remes
b60689e59d Merge pull request #508 from hintjens/master
IPv6 related changes and cleanups to test cases
2013-01-31 11:54:42 -08:00
Pieter Hintjens
309740e197 Fixed issue #499 2013-01-31 20:47:45 +01:00
Pieter Hintjens
963c6a8e2f Lots of cleanups to self-tests
* Removed or truncated sleeps so the tests run faster
* Removed dependencies on zmq_utils
* Rewrote a few tests that were confusing
* Minor code cleanups
2013-01-31 19:46:22 +01:00
Pieter Hintjens
c39cb0bde1 Rewrote completely, was bogusly testing EAGAIN 2013-01-31 16:26:28 +01:00
Pieter Hintjens
3a558fcc4b Rewrote raw test completely 2013-01-31 15:00:17 +01:00
Pieter Hintjens
8c9289342a Fixed use of deprecated zmq_init/term 2013-01-31 09:10:49 +01:00
Pieter Hintjens
5f009e5234 Various cleanups to test programs 2013-01-30 23:53:23 +01:00
Pieter Hintjens
18a14aedea Added ZMQ_IPV6 option, cleaned up setsockopt code, it was nasty 2013-01-30 23:53:09 +01:00
Pieter Hintjens
aa21e090e1 Updated .gitignore 2013-01-30 22:24:59 +01:00
Pieter Hintjens
049931fc1e Merge pull request #507 from bjoto/master
LIBZMQ-498 - Remove heap allocations in zmq_poll for small poll item sets
2013-01-30 08:04:31 -08:00
Bjorn Topel
f1e77f2246 Removed heap allocation for in zmq_poll for small item sets
Until now, zmq_poll always allocates the poll items on the heap.
Now, small item sets, up to ZMQ_POLLITEMS_DFLT, are stack allocated
and only larger sets are allocated on the heap.
2013-01-30 16:46:45 +01:00
Pieter Hintjens
470d06bb9e Merge pull request #506 from arsenm/master
Fix using wrong name for windows.h check with cmake
2013-01-27 15:18:11 -08:00
Matt Arsenault
e464a91086 Fix using wrong name for windows.h check in cmake 2013-01-27 18:09:53 -05:00
Pieter Hintjens
e8cbfac966 Merge pull request #503 from chazmcgarvey/define-dummy-eproto
define a dummy EPROTO for platforms that don't use it
2013-01-23 11:55:48 -08:00
Pieter Hintjens
abc8907e44 Merge pull request #505 from arsenm/master
Fix perf-tools build on Linux with cmake
2013-01-23 11:55:17 -08:00
Pieter Hintjens
93618e7d02 Merge pull request #504 from o172/master
Adds tests/test_disconnect_inproc to .gitignore
2013-01-23 11:55:02 -08:00
Matt Arsenault
f01bab6633 Fix cmake not linking librt to perf-tools 2013-01-23 14:31:02 -05:00
o172(xenovo)
0a1bd45721 Added tests/test_disconnect_inproc to .gitignore 2013-01-23 19:20:52 +00:00
Pieter Hintjens
7bc3e53b53 Merge pull request #502 from ianbarber/master
Add bounds check on upstream XSUB messages
2013-01-21 21:18:08 -08:00
Charles McGarvey
ba3e18f700 define a dummy EPROTO for platforms that don't use it
This accomplishes the same thing as 2e2ef7fd in a potentially cleaner way.
2013-01-21 17:14:26 -07:00
Ian Barber
d850272417 Add size check on XSUB message sends
Ensures 0 length messages aren't being checked for subscribtion status on whatever data happens to be following the data pointer.
2013-01-21 16:11:27 -08:00
Pieter Hintjens
eeaa2c8e42 Merge pull request #501 from chazmcgarvey/conditional-eproto
do not use EPROTO on platforms that do not have it
2013-01-21 14:47:35 -08:00
Charles McGarvey
2e2ef7fd33 do not use EPROTO on platforms that do not have it 2013-01-21 15:00:55 -07:00
Pieter Hintjens
3a632185a6 Merge pull request #500 from haf/fixes/asciidoc-title
Shortening the =-chars to make asciidoc work
2013-01-20 03:43:49 -08:00
Henrik
7918175717 Shortening the =-chars to make asciidoc work 2013-01-19 18:02:24 +01:00
Pieter Hintjens
29a1d8ec60 Merge pull request #499 from minrk/ac_header
Minor autoconf tweaks
2013-01-17 23:49:52 -08:00
Pieter Hintjens
f467011dbc Merge pull request #498 from minrk/zmq_ctx_term
deprecate zmq_ctx_destroy in favor of zmq_ctx_term
2013-01-17 23:49:32 -08:00
MinRK
21c97f0cc2 AM_CONFIG_HEADER -> AC_CONFIG_HEADERS
AM_CONFIG_HEADER raises an 'obsolete error' with automake 1.13.
2013-01-17 16:00:38 -08:00
MinRK
64c019e24d move configure.in -> configure.ac
autotools warns that configure.in
should actually be named configure.ac
2013-01-17 15:59:11 -08:00
MinRK
edd43e1ca4 deprecate zmq_ctx_destroy in favor of zmq_ctx_term
in order to avoid logical collisions with pre-existing notions of context destruction in bindings (czmq, pyzmq).
2013-01-17 15:48:18 -08:00
Ian Barber
21fc2a9946 Merge pull request #497 from hintjens/master
Clarified how icp:// works with zmq_bind
2013-01-14 19:54:38 -08:00
Pieter Hintjens
bbc5befc66 Clarified zmq_bind on icp:// 2013-01-14 17:49:19 +01:00
Pieter Hintjens
c2fbb722a4 Merge pull request #496 from amuraru/master
Fixed el5/el6 deps in RPM spec file / newline fix
2013-01-12 08:33:33 -08:00
Adrian Muraru
35f18aef74 Fixed newline in test_disconnect_inproc 2013-01-12 16:21:56 +02:00
Adrian Muraru
fb0beb6f29 Fixed el5/el6 deps in RPM spec file 2013-01-12 16:21:56 +02:00
Ian Barber
7d475add7e Merge pull request #495 from hintjens/master
Whitespace and comment cleanups
2013-01-08 06:22:27 -08:00
Pieter Hintjens
d997d88096 Revert "Old change to move ports off 5555 (was conflicting with other stuff)"
This reverts commit da0efaa81771aba497a961d70f2166f500a52afd.
2013-01-08 09:18:38 +01:00
Pieter Hintjens
aff1406713 Revert "Test cases were failing on bind"
This reverts commit 8ba097f3da8d1a752755a52b1d3ec967c23f0643.
2013-01-08 09:18:23 +01:00
Pieter Hintjens
a4bedc5255 Whitespace and comment fixes 2013-01-08 09:16:50 +01:00
Pieter Hintjens
da0efaa817 Old change to move ports off 5555 (was conflicting with other stuff) 2013-01-08 09:09:27 +01:00
Pieter Hintjens
b0f0d3fcb4 Clarification on zmq_msg_more 2013-01-08 09:08:02 +01:00
Pieter Hintjens
12a648db07 Specified that it's safe to call zmq_msg_more after zmq_msg_close 2013-01-08 09:08:01 +01:00
Pieter Hintjens
ef186fe15b Spelling fixes 2013-01-08 09:08:01 +01:00
Pieter Hintjens
af934f85ca Removed use of deprecated API methods 2013-01-08 09:08:01 +01:00
Pieter Hintjens
8ba097f3da Test cases were failing on bind 2013-01-08 09:08:01 +01:00
Pieter Hintjens
c1f76e433f Merge pull request #494 from jgm-radez/master
allow XSUB/XPUB to send/recv messages unrelated to sub/unsub
2013-01-08 00:05:07 -08:00
John Muehlhausen
d32e392278 allow XSUB/XPUB to send/recv messages unrelated to sub/unsub (LIBZMQ-490)
zmq::xpub_t::xread_activated() – change to process messages without 0
or 1 prefix, but without affecting subscriptions

zmq::xsub_t::xsend() – change to send rather than discard messages
without 0 or 1 prefix, but without affecting subscriptions

Update documentation
2013-01-07 22:24:24 -06:00
Ian Barber
98a91e852e Merge pull request #493 from arsenm/master
Fix minor problem with cmake bulid
2013-01-02 12:51:43 -08:00
Matt Arsenault
45f504d3e2 Fix looking for rc sources in toplevel binary directory 2013-01-02 15:50:04 -05:00
Pieter Hintjens
949d157897 Merge pull request #492 from arsenm/master
Make CMake build usable for other systems
2013-01-02 00:32:15 -08:00
Matt Arsenault
6ce464414b Fix typos 2013-01-02 03:24:11 -05:00
Matt Arsenault
f770954d30 Fix a couple more warnings 2013-01-02 03:24:11 -05:00
Matt Arsenault
6ecb796e77 Fix warnings with MinGW 2013-01-02 03:24:11 -05:00
Matt Arsenault
1ffc5d11dc Fix some of the -Wshadows 2013-01-02 03:24:11 -05:00
Matt Arsenault
14d3245e02 Fix -Wmismatched-tags 2013-01-02 03:24:11 -05:00
Matt Arsenault
edb5a05add Fix -Wmissing-field-initializers 2013-01-02 03:24:11 -05:00
Matt Arsenault
3ebab09ce4 Fix unused argument warnings 2013-01-02 03:24:11 -05:00
Matt Arsenault
e88dc49400 Fix random 3 space tabs 2013-01-02 03:24:11 -05:00
Matt Arsenault
59cafecd96 Fix MinGW32 build
Fix link errors when using -m32 with MinGW
2013-01-02 03:24:11 -05:00
Matt Arsenault
3c7d4840a1 Fix NSIS installer errors, MinGW build.
The CPack NSIS installer was in a state where it would always give a
useless error. I think it was using stuff intended for running cpack
separately from cmake.
2013-01-02 03:24:10 -05:00
Matt Arsenault
a1d6a222ed Generated header is not in ../src/ 2013-01-02 03:24:10 -05:00
Matt Arsenault
4704159f73 Fix cmake build with sun studio 2013-01-02 03:24:10 -05:00
Matt Arsenault
74763e2c8e Don't use the toplevel cmake paths so the build works as a subproject 2013-01-02 03:24:10 -05:00
Matt Arsenault
f3901b35d4 Comments about ICC build failure with 12.x were crazy
Fix warnings with ICC.
2013-01-02 03:24:10 -05:00
Matt Arsenault
0362c310a5 First pass at getting cmake build to work with non-Windows systems.
Make doc building option dependent on asciidoc being installed
Fix MSVC build requiring cygwin.
Don't use try_run to get the version
2013-01-02 03:24:10 -05:00
Matt Arsenault
73c370dd17 Fix inconsistently using #if or #ifdef instead of #if defined 2013-01-02 03:24:10 -05:00
Pieter Hintjens
c7009d274e Merge pull request #491 from pijyoi/issue84
fix for LIBZMQ-84: Address already in use (signaler.cpp)
2013-01-01 08:32:12 -08:00
Pieter Hintjens
1eee9ce035 Merge pull request #490 from pijyoi/master
eliminate dead code moved into zmq_utils.cpp
2012-12-29 02:26:06 -08:00