3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-16 12:16:33 +08:00
Code Issues Projects Releases Wiki Activity
4,421 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

4421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
86aa7bb1bc Problem: commit a464eec7 really broke VS2015 builds 
Took me over 8 hours to track down the cause of bizarre link
errors when building with libsodium. The VS project files are
not simple things.

Note to self and other maintainers: when someone is obviously
out of their depth, do not merge their changes to build scripts
without cynical appraisal.

Solution: undo the damage.
 2016-02-05 00:25:59 +01:00
Pieter Hintjens
c5bf0dc0a4 Merge pull request #1770 from bluca/systemd 
Problem: no support for pre-allocated file descriptors [systemd | upstart socket-based activation]
 2016-02-04 18:51:28 +01:00
Luca Boccassi
84ad4bf0ff Problem: cannot use new pre-allocated FD with TCP 
Solution: parse the value set by the ZMQ_PRE_ALLOCATED_FD sockopt
when creating a new TCP socket and use it if valid.
Add new tests/test_pre_allocated_fd_tcp.cpp unit test.
 2016-02-04 16:57:26 +00:00
Luca Boccassi
9b885b7c00 Problem: cannot use new pre-allocated FD with IPC 
Solution: parse the value set by the ZMQ_PRE_ALLOCATED_FD sockopt
when creating a new IPC socket and use it if valid.
Add new tests/test_pre_allocated_fd_ipc.cpp unit test.
 2016-02-04 16:57:26 +00:00
Luca Boccassi
4bcbb3055e Problem: cannot use pre-allocated FDs. Fixes #777 
Solution: add new [set|get]sockopt ZMQ_PRE_ALLOCATED_FD to allow
users to let ZMQ use a pre-allocated file descriptor instead of
allocating a new one. Update [set|get]sockopt documentation and
test accordingly.

The main use case for this feature is a socket-activated systemd
service. For more information about this feature see:
http://0pointer.de/blog/projects/socket-activation.html
 2016-02-04 16:57:26 +00:00
Constantin Rack
8b0fdd94d3 Merge pull request #1767 from hintjens/master 
Problem: Android build is slow and noisy
 2016-02-04 11:59:12 +01:00
Pieter Hintjens
a3d9b46a60 Problem: Android build is slow and noisy 
Solution: use --without-docs (changed from --without-documentation)
and also --quiet.
 2016-02-04 11:24:25 +01:00
Joe Eli McIlvain
08cfbdef7d Merge pull request #1766 from hintjens/master 
Problem: MSVC build does not detect libsodium
 2016-02-03 15:12:02 -08:00
Pieter Hintjens
31d181effb Problem: MSVC build does not detect libsodium 
Caused by error in last commit which used HAVE_LIBSODIUM instead
of HAVE_SODIUM.

Solution: use HAVE_LIBSODIUM as we do in other configure scripts.

The project is called 'libsodium' and not 'sodium'.
 2016-02-03 23:45:01 +01:00
Constantin Rack
8fad51c270 Merge pull request #1765 from hintjens/master 
Windows command-line build is now configurable
 2016-02-03 22:52:02 +01:00
Pieter Hintjens
6a9af8ed62 Problem: can't build without libsodium from command line (MSVC) 
There is an option to enable/disable libsodium via the Visual Studio
UI. This is not practical for command-line usage (via msbuild).

Solution: add configure.bat that searches for libsodium in sibling
directory to libzmq; if it finds it, defines HAVE_LIBSODIUM 1.

This is consistent with zproject, which has the same problem and
is getting the same solution for all dependency resolution on
Windows.

Note that this approach also provides a way to support tweetnacl
via a configure option.

Also, removed duplicate props files and re-copy in configure.bat
as it was an insane nightmare to update these by hand. (and not
clear that they were identical. Now it's forced.)
 2016-02-03 22:44:06 +01:00
Pieter Hintjens
984699c427 Problem: was ignoring directories with build files 
Solution: fix .gitignore
 2016-02-03 21:13:54 +01:00
Luca Boccassi
d7a7f48918 Problem: my name is not in the AUTHORS file 
Solution: add myself to the list
 2016-02-03 17:32:02 +00:00
Pieter Hintjens
3d9984efe2 Merge pull request #1764 from GreatFruitOmsk/master 
Make VMCI work on Windows
 2016-02-03 16:21:53 +01:00
Constantin Rack
ad286d9442 Merge pull request #1763 from CommanderBubble/patch-1 
configure doesn't correctly determine mingw64
 2016-02-03 15:05:09 +01:00
Ilya Kulakov
538e5d4742 Make VMCI to work on Windows. 
select was improved to support multiple service providers on Windows.
it should be slightly faster because of optimized iteration
over selected sockets.
 2016-02-03 19:12:11 +06:00
Ilya Kulakov
d7e59d6188 Fix integer overflow error when calculating throughput. 2016-02-03 19:00:51 +06:00
Michael
f38062e6e3 fix configure errors for 64bit mingw 
changes the search pattern for host_os from *mingw32* to *mingw* so that mingw64 can be used, and any mingw32 variable name change to mingw.
 2016-02-03 23:54:22 +11:00
Michael
0463926db8 change references from mingw32 to mingw 
conformity update for mingw32 variables to mingw
 2016-02-03 23:51:52 +11:00
Michael
bdda5189f0 fix configure errors for 64bit mingw 
changes the search pattern for host_os from *mingw32* to *mingw* so that mingw64 can be used
 2016-02-03 23:38:33 +11:00
Constantin Rack
0329402d0a Merge pull request #1762 from hintjens/master 
Fixed VS2015 build
 2016-02-02 23:19:53 +01:00
Pieter Hintjens
d218e03884 Problem: project files have tool version in two places 
Leading to extra work when copying between versions of VS.

Solution: remove second unnecessary definition.
 2016-02-02 22:49:15 +01:00
Pieter Hintjens
4ce9c7c742 Problem: does not build on VS2015 
Solution: add missing project files

(Also, updated FD_SETSIZE to 16K as a bonus.)
 2016-02-02 22:31:18 +01:00
Constantin Rack
963dffb54a Merge pull request #1760 from hintjens/master 
Problem: not building on VS2015
 2016-02-02 22:30:18 +01:00
Pieter Hintjens
b92055fa56 Problem: not building on VS2015 
Solution: fixed project files, and warning in timers.cpp
 2016-02-02 22:05:56 +01:00
Constantin Rack
c6b11ae4a7 Merge pull request #1758 from zeromq/revert-1757-revert-1756-replace-zmq-term 
Revert "Revert "Problem: deprecated use and reference of `zmq_term`""
 2016-02-01 23:02:32 +01:00
Pieter Hintjens
44c6b0484e Revert "Revert "Problem: deprecated use and reference of zmq_term"" 2016-02-01 23:00:06 +01:00
Constantin Rack
c143a7d397 Merge pull request #1757 from zeromq/revert-1756-replace-zmq-term 
Revert "Problem: deprecated use and reference of `zmq_term`"
 2016-02-01 22:46:54 +01:00
Pieter Hintjens
1708bfefb7 Revert "Problem: deprecated use and reference of zmq_term" 2016-02-01 22:41:51 +01:00
Joe Eli McIlvain
d44a8ccddb Merge pull request #1756 from c-rack/replace-zmq-term 
Problem: deprecated use and reference of `zmq_term`
 2016-02-01 13:35:33 -08:00
Constantin Rack
a26bb743d4 Problem: docs are still referring to deprecated zmq_term 
Solution: Replace with `zmq_ctx_term`
 2016-02-01 22:00:35 +01:00
Constantin Rack
589464ced9 Problem: comments still refer to deprecated zmq_term. 
Solution: replace with `zmq_ctx_term`

Also fix whitespace (tabs instead of spaces)
 2016-02-01 21:51:54 +01:00
Constantin Rack
10d9ef8a5f Problem: perf use deprecated zmq_term 
Solution: replace all occurrences with `zmq_ctx_term`
 2016-02-01 21:44:01 +01:00
Constantin Rack
0d171563d0 Problem: tests use deprecated zmq_term function 
Solution: replace all occurrences with `zmq_ctx_term`
 2016-02-01 21:40:24 +01:00
Constantin Rack
d92e40901d Merge pull request #1755 from UsamaMehboob/master 
fixed issue #1754
 2016-02-01 21:30:08 +01:00
Usama Mehboob
a72cb5d43d added #include<unistd.h> in udp_engine.cpp to solve error 'close was not declared in scope' 2016-02-02 01:17:12 +05:00
Pieter Hintjens
e1254e100e Merge pull request #1751 from c-rack/remove-zmq-utils-includes 
Problem: deprecated `zmq_utils.h` is still included
 2016-02-01 12:05:01 +01:00
Constantin Rack
7da3ee138e Problem: deprecated zmq_utils.h is still included 
Solution: remove all remaining references to `zmq_utils.h`
 2016-02-01 11:34:36 +01:00
Constantin Rack
435535ce92 Merge pull request #1750 from hintjens/master 
Problem: various errors in build scripts
 2016-02-01 11:22:13 +01:00
Pieter Hintjens
6f94af8cca Problem: various errors in build scripts 
- zmq_utils.h was removed
- udp_address.cpp and udp_engine.cpp were added

Solution: patch all affected build scripts
 2016-02-01 11:18:08 +01:00
Pieter Hintjens
3cf6c33132 Merge pull request #1748 from sunkin351/master 
Added "udp_address" and "udp_engine" to VS2015 project
 2016-02-01 10:25:17 +01:00
sunkin351
9b01ae826e Restoring zmq_utils.h from previous version 
I hope restoring this from a previous version doesn't do any damage, it
is missing in the current version of this repository and is vital for
the lib to compile anywhere.
 2016-01-31 20:19:04 -08:00
sunkin351
a464eec7df Added "udp_address" and "udp_engine" to enable windows build 
Altered VS2015 files to enable building of the library.
 2016-01-31 17:54:31 -08:00
Joe Eli McIlvain
d7ef68d6b7 Merge pull request #1747 from c-rack/remove-zmq-utils-h 
Problem: `zmq_utils.h` is deprecated since 2014-07-09
 2016-01-31 17:31:47 -08:00
Constantin Rack
af775c0c8b Problem: zmq_utils.h is deprecated since 2014-07-09 
Solution: remove this file
 2016-02-01 00:54:53 +01:00
Constantin Rack
8dbda15e21 Merge pull request #1745 from somdoron/master 2016-01-30 22:23:35 +01:00
Constantin Rack
4f4e475331 Merge pull request #1746 from minrk/allow-underscore-dns 2016-01-30 22:23:09 +01:00
Min RK
cdec4dc9ee allow underscores in domain names 
Since they are allowed

(They are not, however, allowed in hostnames)
 2016-01-30 21:30:30 +01:00
somdoron
389e853c6d Fix compilation errors on windows 2016-01-30 13:29:41 +02:00
Doron Somech
add4e7675f Merge pull request #1744 from jcfr/fix-gcc-warnings 
Fix unused-parameter/unused-but-set-variable/missing-field-initializers warnings
 2016-01-30 09:08:09 +01:00
Doron Somech
318dd7c717 Merge pull request #1743 from jcfr/add-missing-ctest-tests 
ctest: Add missing test_udp and test_large_msg
 2016-01-30 09:06:57 +01:00
Doron Somech
73f73ddaa9 Merge pull request #1742 from jemc/master 
Problem: `udp_address::interface` conflicts with VS2015 build.
 2016-01-30 09:06:40 +01:00
Jean-Christophe Fillion-Robin
2cb8da3bfd Style: Fix -Wmissing-field-initializers in socket_poller.cpp 
This commit addresses the following warnings reported on gcc 5.2.1. In
the future, this will help reduce the "noise" and help catch warnings
revealing a serious problem.

It was originally introduce in the refactoring associated with
zeromq/libzmq@da2bc60 (Removing zmq_pollfd as it is replaced by zmq_poller).

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
/path/to/libzmq/src/socket_poller.cpp: In member function ‘int zmq::socket_poller_t::add(zmq::socket_base_t*, void*, short int)’:
/path/to/libzmq/src/socket_poller.cpp:92:51: warning: missing initializer for member ‘zmq::socket_poller_t::item_t::pollfd_index’ [-Wmissing-field-initializers]
     item_t item = {socket_, 0, user_data_, events_};
                                                   ^
/path/to/libzmq/src/socket_poller.cpp: In member function ‘int zmq::socket_poller_t::add_fd(zmq::fd_t, void*, short int)’:
/path/to/libzmq/src/socket_poller.cpp:108:50: warning: missing initializer for member ‘zmq::socket_poller_t::item_t::pollfd_index’ [-Wmissing-field-initializers]
     item_t item = {NULL, fd_, user_data_, events_};
                                                  ^
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
 2016-01-30 02:56:03 -05:00
Jean-Christophe Fillion-Robin
46b02338e3 Style: Fix -Wunused-but-set-variable in test_stream_exceeds_buffer.cpp 
This commit addresses the following warnings reported on gcc 5.2.1. In
the future, this will help reduce the "noise" and help catch warnings
revealing a serious problem.

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
/path/to/libzmq/tests/test_stream_exceeds_buffer.cpp: In function ‘int main()’:
/path/to/libzmq/tests/test_stream_exceeds_buffer.cpp:19:9: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
     int rc = setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
         ^
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
 2016-01-30 02:56:03 -05:00
Jean-Christophe Fillion-Robin
f329252dcb Style: Fix unused parameter compilation warnings 
This commit addresses the following warnings reported on gcc 5.2.1. In
the future, this will help reduce the "noise" and help catch warnings
revealing a serious problem.

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
/path/to/libzmq/src/options.cpp:1048:36: warning: unused parameter ‘option_’ [-Wunused-parameter]
 bool zmq::options_t::is_valid (int option_) const
                                    ^

/path/to/libzmq/src/plain_client.cpp:146:30: warning: unused parameter ‘cmd_data’ [-Wunused-parameter]
         const unsigned char *cmd_data, size_t data_size)
                              ^

/path/to/libzmq/src/plain_client.cpp:146:30: warning: unused parameter ‘cmd_data’ [-Wunused-parameter]
         const unsigned char *cmd_data, size_t data_size)
                              ^

/path/to/libzmq/src/socket_base.cpp:1445:44: warning: unused parameter ‘group_’ [-Wunused-parameter]
 int zmq::socket_base_t::xjoin (const char *group_)
                                            ^
/path/to/libzmq/src/socket_base.cpp:1451:45: warning: unused parameter ‘group_’ [-Wunused-parameter]
 int zmq::socket_base_t::xleave (const char *group_)
                                             ^

/path/to/libzmq/src/radio.cpp:145:33: warning: unused parameter ‘msg_’ [-Wunused-parameter]
 int zmq::radio_t::xrecv (msg_t *msg_)
                                 ^
/path/to/libzmq/src/dish.cpp:164:32: warning: unused parameter ‘msg_’ [-Wunused-parameter]
 int zmq::dish_t::xsend (msg_t *msg_)
                                ^

/path/to/libzmq/tests/test_msg_ffn.cpp:32:16: warning: unused parameter ‘data’ [-Wunused-parameter]
 void ffn(void *data, void *hint) {
                ^

/path/to/libzmq/tests/test_timers.cpp:50:19: warning: unused parameter ‘timer_id’ [-Wunused-parameter]
 void handler (int timer_id, void* arg)
                   ^
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
 2016-01-30 02:56:03 -05:00
Jean-Christophe Fillion-Robin
05e48cc6a9 ctest: Add missing test_udp and test_large_msg 
This commit fixes the author warnings reported below. These tests
have originally been introduced in zeromq/libzmq@5ebfd17 and
zeromq/libzmq@5fe75f0.

8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
CMake Warning (dev) at tests/CMakeLists.txt:133 (message):
  Test 'test_udp' is not known to CTest.
This warning is for project developers.  Use -Wno-dev to suppress it.

CMake Warning (dev) at tests/CMakeLists.txt:133 (message):
  Test 'test_large_msg' is not known to CTest.
This warning is for project developers.  Use -Wno-dev to suppress it.
8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---8<---
 2016-01-30 02:10:01 -05:00
Joe Eli McIlvain
cf5c288dda Rename udp_address::interface to iface for VS2015 build. 
Resolves #1739.
 2016-01-29 19:50:04 -08:00
Pieter Hintjens
b784943f90 Merge pull request #1737 from somdoron/radio-dish 
Problem: no udp/multicast support in zeromq
 2016-01-29 20:23:10 +01:00
somdoron
5ebfd1728f make udp support for radio-dish 2016-01-29 21:17:11 +02:00
Constantin Rack
a2b9d826e4 Merge pull request #1735 from hintjens/master 
Problem: radio/dish class broke Windows builds
 2016-01-29 11:24:33 +01:00
Pieter Hintjens
2ae4c55bf5 Problem: radio/dish class broke Windows builds 
Solution: add these new classes to MSVC project files
 2016-01-29 11:07:21 +01:00
Constantin Rack
1bcb0a737e Merge pull request #1734 from somdoron/radio-dish 
problem: radio-dish is still hacky
 2016-01-29 10:17:54 +01:00
somdoron
1960b4e8a9 Filtering messages on dish side 2016-01-29 10:53:47 +02:00
somdoron
c7d52ec260 radio-dish join/leave are ZMTP commands 2016-01-29 10:53:47 +02:00
somdoron
5054f2eb61 radio-dish is sending the group as first frame 2016-01-29 10:53:47 +02:00
somdoron
68675e23d9 adds group to zmq_msg 2016-01-29 10:53:42 +02:00
somdoron
b2718149e0 msg external storage is using content_t 2016-01-29 10:46:42 +02:00
Constantin Rack
e424388608 Merge pull request #1730 from somdoron/master 
problem: request socket state machine check is not running
 2016-01-28 19:11:27 +01:00
somdoron
15ad6f8051 save some bytes in msg class 2016-01-28 18:53:35 +02:00
somdoron
dc945998a4 missing virtual modifier or session_base 2016-01-28 18:31:05 +02:00
Pieter Hintjens
16f1be9de3 Merge pull request #1729 from c-rack/update-copyright-year 
Problem: copyright year is still 2015
 2016-01-28 15:26:45 +01:00
Constantin Rack
a539b0c6e8 Problem: copyright year is still 2015 
Solution: update to 2016
 2016-01-28 15:07:31 +01:00
Constantin Rack
a7b7f3e6c2 Merge pull request #1727 from somdoron/master 
problem: pub/sub pattern in zeromq is complicated and not thread safe
 2016-01-27 17:28:59 +01:00
somdoron
b8425a25cf radio-dish pattern 2016-01-27 18:22:48 +02:00
Constantin Rack
511d701de3 Merge pull request #1725 from GreatFruitOmsk/master 2016-01-22 16:00:33 +01:00
Ilya Kulakov
77f5344ff7 Fix VMCI compilation errors on Windows. 2016-01-22 20:34:23 +06:00
Pieter Hintjens
1c7d59a58a Merge pull request #1724 from minrk/multi-monitor 
stop previous monitor socket before starting new one
 2016-01-22 13:50:06 +01:00
Min RK
f0dce000b2 stop previous monitor socket before starting new one 
avoids leaking sockets due to multiple monitor calls on one socket

Alternative: raise error (not sure what errno; EADDRINUSE?) if collision detected; force manual stop.
 2016-01-21 16:21:07 +01:00
Constantin Rack
f25a9c83f5 Merge pull request #1723 from GreatFruitOmsk/master 
Family is not set when resolving NIC on android.
 2016-01-21 15:56:26 +01:00
Ilya Kulakov
6c9974770b Family is not set when resolving NIC on android. 
Make it ready to enable ipv6 for AIX or HP/UX
 2016-01-21 19:53:35 +06:00
Pieter Hintjens
cfbeac6ad1 Merge pull request #1722 from GreatFruitOmsk/master 
Fix missing headers.
 2016-01-21 08:46:14 +01:00
Ilya Kulakov
e7850410f8 Fix trailing spaces. 2016-01-21 13:44:15 +06:00
Ilya Kulakov
e5894d5197 Fix missing headers which makes compilation fail on Android. 2016-01-21 13:44:01 +06:00
Joe Eli McIlvain
55e8191ac5 Merge pull request #1721 from c-rack/fix-issue-1720 
Problem: build fails due to undefined INT_MAX
 2016-01-20 14:56:20 -06:00
Constantin Rack
5c9bd5f0cb Problem: SIZE_MAX is not defined in all stdint.h includes 
Solution: remove debug printf line completely
 2016-01-20 19:30:21 +01:00
Constantin Rack
b7d42a4c4b Problem: SIZE_MAX is not defined 
Solution: include stdint.h
 2016-01-20 19:18:00 +01:00
Constantin Rack
924bce6478 Problem: build fails due to undefined INT_MAX 
Solution: include climits

Fixes #1720
 2016-01-20 19:16:54 +01:00
Constantin Rack
a40dd50da1 Merge pull request #1719 from minrk/rc-int-max 
truncate rc to INT_MAX for send/recv
 2016-01-20 13:53:33 +01:00
Min RK
5fe75f0e43 truncate rc to INT_MAX 
to avoid overflow for large messages

send/recv still succeed for large messages,
but `zmq_msg_size` must be used to get the true size.
 2016-01-20 13:43:51 +01:00
Constantin Rack
90f9f5ff91 Merge pull request #1718 from gcsideal/master 
Last bits of Hurd support
 2016-01-20 11:28:18 +01:00
Laszlo Boszormenyi (GCS)
be387d5e56 Last bits of Hurd support 2016-01-20 07:18:22 +01:00
Joe Eli McIlvain
c42bf873bb Merge pull request #1717 from c-rack/fix-typo 
Problem: typo
 2016-01-19 14:27:15 -06:00
Constantin Rack
e6edc4729e Problem: typo 
Solution: fix it
 2016-01-19 21:23:42 +01:00
Constantin Rack
cc29578088 Merge pull request #1716 from somdoron/master 
Problem: client over inproc receives the msg with routing id set
 2016-01-19 19:30:38 +01:00
somdoron
669c5697c2 fixing a bug: client over inproc receives msg with routing id set 2016-01-19 20:18:04 +02:00
Constantin Rack
e0fc5841cd Merge pull request #1715 from hintjens/master 
Problem: configure --without-documentation is clumsy
 2016-01-18 22:55:22 +01:00
Pieter Hintjens
88949694db Problem: configure --without-documentation is clumsy 
It's inconsistent, and should be --with-something=yes/no. Also the
term 'documentation' is long and clumy.

Solution: use --with-docs instead.
 2016-01-18 21:25:22 +01:00
Pieter Hintjens
9ebb5cc911 Merge pull request #1714 from somdoron/master 
problem: condition variable setting invalid timeout
 2016-01-18 14:45:05 +01:00
somdoron
4bfe2ec686 fix bug in condition variable using invalid timeout 2016-01-18 15:32:49 +02:00
Pieter Hintjens
d906e815bc Merge pull request #1713 from minrk/stdint 
restore check for MSC 1600 before including stdint.h
 2016-01-18 12:47:45 +01:00