Azat Khuzhin [Wed, 7 Nov 2018 21:21:08 +0000 (00:21 +0300)]
Remove Vagrantfile (will be moved into libevent-extras)
Since:
- it is not a library
- this file should have (if I had enough time) enough fixes in itself
and should not polute libevent history
- it "requires" (it more cleaner to use it in this way) script --
tools/vagrant-tests.py (indeed, from libevent-extras)
- will has it's own issues/README/...
https://github.com/libevent/libevent-extras
Azat Khuzhin [Wed, 7 Nov 2018 21:36:07 +0000 (00:36 +0300)]
regress_ssl: fix ssl/bufferevent_wm_filter for non defered callbacks
Even after referenced patch there is still possible recursive callbacks
from evbuffer_drain(bev_input), i.e.:
wm_transfer() -> evbuffer_drain() -> wm_transfer()
inc(ctx->get)
But if we will increment ctx->get before drain that we will not add more
data to buffer.
Refs:
54c6fe3c ("regress_ssl: make ssl/bufferevent_wm_filter more fault-tolerance")
CI: https://ci.appveyor.com/project/nmathewson/libevent/build/job/f0rv299i71wnuxdq#L2546
Azat Khuzhin [Tue, 6 Nov 2018 08:30:18 +0000 (11:30 +0300)]
appveyor: skip travis patches (by commit subject/files)
Azat Khuzhin [Mon, 5 Nov 2018 14:04:47 +0000 (17:04 +0300)]
appveyor: cache build directory to reduce overall time (6x time faster)
various build checks (i.e. detecting headers/macroses/functions) takes
7 minutes (from 13 minutes in total) for cmake, which is too high.
By using cache we can reduce this to ~0.
And set APPVEYOR_SAVE_CACHE_ON_ERROR so that cmake checks will be
cached (anyway all sources will be built from scratch due to timestamp
updates while extracting from sources).
Azat Khuzhin [Mon, 5 Nov 2018 22:22:13 +0000 (01:22 +0300)]
appveyor: disable verbosity
Azat Khuzhin [Mon, 5 Nov 2018 15:00:41 +0000 (18:00 +0300)]
appveyor: do not run on branches that has "travis" in it's name
Azat Khuzhin [Mon, 5 Nov 2018 15:30:38 +0000 (18:30 +0300)]
cmake: set CMP0075 to NEW (for ws2_32.lib in win32)
Otherwise cmake complains:
Policy CMP0075 is not set: Include file check macros honor
CMAKE_REQUIRED_LIBRARIES. Run "cmake --help-policy CMP0075" for policy
details. Use the cmake_policy command to set the policy and suppress this
warning.
CMAKE_REQUIRED_LIBRARIES is set to:
ws2_32.lib
For compatibility with CMake 3.11 and below this check is ignoring it.
Azat Khuzhin [Mon, 5 Nov 2018 15:23:31 +0000 (18:23 +0300)]
cmake: set CMP0074 to NEW (for OPENSSL_ROOT in appveyor)
We have $env:OPENSSL_ROOT (env) equals to -DOPENSSL_ROOT (cmake
variable) anyway.
cmake complains:
Policy CMP0074 is not set: find_package uses <PackageName>_ROOT variables.
Run "cmake --help-policy CMP0074" for policy details. Use the cmake_policy
command to set the policy and suppress this warning.
Environment variable OpenSSL_ROOT is set to:
C:/OpenSSL-Win64/bin
For compatibility, CMake is ignoring the variable.
This warning is for project developers. Use -Wno-dev to suppress it.
Azat Khuzhin [Mon, 5 Nov 2018 19:58:25 +0000 (22:58 +0300)]
travis: use homebrew via addon (-~4min/16% from the build time)
Azat Khuzhin [Mon, 5 Nov 2018 19:25:15 +0000 (22:25 +0300)]
regress_ssl: make ssl/bufferevent_wm_filter more fault-tolerance
Due to inplace callbacks (i.e. no BEV_OPT_DEFER_CALLBACKS) we cannot be
sure that wm_transfer() will not be called recursively and indeed it
still happens sometimes, and the referenced patch increase amount of
this times, especially for linux/poll.
Fixes: 66304a23cf748714159c988e78f35401c5352827 ("Fix
ssl/bufferevent_wm_filter when bev does not reach watermark on break")
Azat Khuzhin [Mon, 5 Nov 2018 18:33:54 +0000 (21:33 +0300)]
regress_http: disable http/read_on_write_error under win32
EVHTTP_CON_READ_ON_WRITE_ERROR works only if an error already read from
the socket, but if we already got EPIPE on write we cannot read from the
socket anymore, and win32 does not guarantee that read will happens
before (although it happens from time to time).
In the referenced patch I just replaced callback with not expecting 417,
but like I already wrote, this is not always true (i.e. it is flacky).
Fixes: 3b581693ac1967f7f8d98491cb772a1b415eb4cd ("test/http:
read_on_write_error: fix it for win32")
Azat Khuzhin [Mon, 5 Nov 2018 15:02:05 +0000 (18:02 +0300)]
travis-ci: exclude appveyor branches
Azat Khuzhin [Sun, 4 Nov 2018 16:48:11 +0000 (19:48 +0300)]
cmake: do not detect _GNU_SOURCE/__GNU_LIBRARY__ if it is cached
Azat Khuzhin [Sun, 4 Nov 2018 18:41:20 +0000 (21:41 +0300)]
Merge branch 'ssl_bufferevent_wm_filter-fix'
* ssl_bufferevent_wm_filter-fix:
Fix ssl/bufferevent_wm_filter when bev does not reach watermark on break
regress_ssl: cover watermarks with deferred callbacks
regress_ssl: improve bufferevent_wm/bufferevent_wm_filter logging
Azat Khuzhin [Sun, 4 Nov 2018 17:40:04 +0000 (20:40 +0300)]
Fix ssl/bufferevent_wm_filter when bev does not reach watermark on break
For the ssl/bufferevent_wm* we have next configuration:
- payload_len = 1024
- wm_high = 5120
- limit = 40960
- to_read = 512
In this test we expect that with high watermark installed to "wm_high"
we will read "limit" bytes by reading "to_read" at a time, but adding
"payload_len" at a time (this "to_read"/"payload_len" limits is
installed to finally overflow watermark).
Once we read "limit" bytes we break, by disable EV_READ and reset
callbacks. Although this will not work if when we want to break we do
not reach watermark, this is because watermarks installs evbuffer
callback for the input buffer and if the watermark does not reached it
will enable EV_READ while be_openssl_enable() will read from the
underlying buffer (in case the openssl bufferevent created via
bufferevent_openssl_filter_new()) and call callback again (until it will
reach watermark or read al from the underlying buffer -- this is why it
stops in our caes).
And this is exactly what happened in win32, you can see this in the
following logs:
- win32 before:
OK C:\vagrant\test\regress_ssl.c:829: wm_transfer-client(
00DC2750): in: 4608, out: 0, got: 40960
OK C:\vagrant\test\regress_ssl.c:834: wm_transfer-client(
00DC2750): break
OK C:\vagrant\test\regress_ssl.c:829: wm_transfer-client(
00DC2750): in: 4608, out: 0, got: 41472
OK C:\vagrant\test\regress_ssl.c:834: wm_transfer-client(
00DC2750): break
OK C:\vagrant\test\regress_ssl.c:829: wm_transfer-client(
00DC2750): in: 4608, out: 0, got: 41984
OK C:\vagrant\test\regress_ssl.c:834: wm_transfer-client(
00DC2750): break
OK C:\vagrant\test\regress_ssl.c:829: wm_transfer-client(
00DC2750): in: 4608, out: 0, got: 42496
OK C:\vagrant\test\regress_ssl.c:834: wm_transfer-client(
00DC2750): break
- win32 after:
OK C:\vagrant\test\regress_ssl.c:821: wm_transfer-client(
00FC26F0): break
OK C:\vagrant\test\regress_ssl.c:836: wm_transfer-client(
00FC26F0): in: 4800, out: 0, got: 40960
- linux before:
OK ../test/regress_ssl.c:829: wm_transfer-client(0x55555566f5e0): in: 5120, out: 0, got: 40960
OK ../test/regress_ssl.c:834: wm_transfer-client(0x55555566f5e0): break
- linux after:
OK ../test/regress_ssl.c:821: wm_transfer-client(0x55555566f5e0): break
OK ../test/regress_ssl.c:836: wm_transfer-client(0x55555566f5e0): in: 5120, out: 0, got: 40960
(As you can see in linux case we already reach watermark hence it passed
before).
So fix the issue by breaking before draining.
But during fixing this I was thinking is this right? I.e. reading from
the be_openssl_enable(), maybe we should force deferred callbacks at
least?
Azat Khuzhin [Sun, 4 Nov 2018 17:15:14 +0000 (20:15 +0300)]
regress_ssl: cover watermarks with deferred callbacks
Azat Khuzhin [Sun, 4 Nov 2018 17:03:50 +0000 (20:03 +0300)]
regress_ssl: improve bufferevent_wm/bufferevent_wm_filter logging
- add bev pointer
- use EV_SIZE_FMT over %zu (win32)
Azat Khuzhin [Fri, 2 Nov 2018 20:43:57 +0000 (23:43 +0300)]
regress_http: make https_basic non time dependent
Fixes: #454
Azat Khuzhin [Sat, 3 Nov 2018 22:21:48 +0000 (01:21 +0300)]
Merge branch 'check-O_NONBLOCK-in-debug'
* check-O_NONBLOCK-in-debug:
regress: use non blocking descriptors whenever it is possible
assert that fds are nonblocking in debug mode
Closes: nmathewson/Libevent#90
Azat Khuzhin [Sat, 3 Nov 2018 21:59:33 +0000 (00:59 +0300)]
regress: use non blocking descriptors whenever it is possible
Next tests uses fds without O_NONBLOCK flag
- main/free_active_base
- main/many_events
- et/et (has some other bits cleaned up by using TT_* flags and test
setup/cleanup callbacks)
And hence they will fail in debug mode (EVENT_DEBUG_MODE=):
Assertion flags & O_NONBLOCK failed in event_debug_assert_socket_nonblocking_
Greg Hazel [Wed, 8 Jan 2014 22:57:14 +0000 (14:57 -0800)]
assert that fds are nonblocking in debug mode
Check that each fd that had been added with some event do has O_NOBLOCK
after event_enable_debug_mode()
Rebased and do not check signals (EV_SIGNAL) by azat.
Refs: nmathewson/Libevent#90
Refs: #96
Azat Khuzhin [Wed, 31 Oct 2018 03:34:40 +0000 (06:34 +0300)]
Add cmake rules into dist archive
Fixes: #502
Refs: #551
Azat Khuzhin [Tue, 30 Oct 2018 22:22:30 +0000 (01:22 +0300)]
Merge branch 'event-ET-#636-v2'
* event-ET-#636-v2:
Preserve ET bit for backends with changelist
Epoll ET setting lost with multiple events for same fd
Cover ET with multiple events for same fd
Add ET flag into event_base_dump_events()
Fixes: #636
Azat Khuzhin [Tue, 30 Oct 2018 20:59:24 +0000 (23:59 +0300)]
Preserve ET bit for backends with changelist
Isidor Kouvelas [Tue, 30 Oct 2018 15:50:08 +0000 (08:50 -0700)]
Epoll ET setting lost with multiple events for same fd
After two or more events have been registered for the same file
descriptor using EV_ET, if one of the events is deleted, then the
epoll_ctl() call issued by libevent drops the EPOLLET flag resulting in
level triggered notifications.
[ azat: use existing "et" in the evmap_io_del_() ]
Isidor Kouvelas [Tue, 30 Oct 2018 21:09:38 +0000 (00:09 +0300)]
Cover ET with multiple events for same fd
[ azat: test cleanup ]
Azat Khuzhin [Mon, 29 Oct 2018 19:22:00 +0000 (22:22 +0300)]
Add ET flag into event_base_dump_events()
Azat Khuzhin [Sun, 28 Oct 2018 17:52:32 +0000 (20:52 +0300)]
appveyor: reconfigure tests with allow_failure and fast_finish
Azat Khuzhin [Sun, 28 Oct 2018 16:48:37 +0000 (19:48 +0300)]
Merge branch 'win32-visibility-event_debug_logging_mask_'
* win32-visibility-event_debug_logging_mask_:
Introduce EVENT_VISIBILITY_WANT_DLLIMPORT
regress_http: use TT_BLAZER() over event_debug()
Fixes: #702
Azat Khuzhin [Sun, 28 Oct 2018 16:30:34 +0000 (19:30 +0300)]
Introduce EVENT_VISIBILITY_WANT_DLLIMPORT
And use it in places where event_debug() should be called (since it
requires access to "event_debug_logging_mask_" and in win32 it is
tricky).
One of this places that is covered by this patch is the test for
event_debug().
Azat Khuzhin [Sun, 28 Oct 2018 16:27:05 +0000 (19:27 +0300)]
regress_http: use TT_BLAZER() over event_debug()
Later is pretty tricky due to exporting event_debug_logging_mask_ symbol
for win32.
Azat Khuzhin [Sun, 28 Oct 2018 15:11:22 +0000 (18:11 +0300)]
Check existence of IPV6_V6ONLY in evutil_make_listen_socket_ipv6only() (mingw32)
MinGW 32-bit 5.3.0 does not defines it and our appveyour [1] build
reports this instantly:
evutil.c: In function 'evutil_make_listen_socket_ipv6only':
evutil.c:392:40: error: 'IPV6_V6ONLY' undeclared (first use in this function)
return setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void*) &one,
[1]: https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
Another solution will be to use mingw64 which has it, but I guess we do
want that #ifdef anyway.
Azat Khuzhin [Sun, 28 Oct 2018 13:46:24 +0000 (16:46 +0300)]
Convert evbuffer_strspn() (internal helper) to use size_t
As pointed by @yankeehacker in #590:
Signed to Unsigned Conversion Error - buffer.c:1623
Description: This assignment creates a type mismatch by populating an
unsigned variable with a signed value. The signed integer will be
implicitly cast to an unsigned integer, converting negative values into
positive ones. If an attacker can control the signed value, it may be
possible to trigger a buffer overflow if the value specifies the length
of a memory write.
Remediation: Do not rely on implicit casts between signed and unsigned
values because the result can take on an unexpected value and violate
weak assumptions made elsewhere in the program.
Fixes: #590
Azat Khuzhin [Sun, 28 Oct 2018 12:16:24 +0000 (15:16 +0300)]
buffer: add an assert for last_with_datap to suppress static analyzer
../buffer.c:2231:6: warning: Access to field 'flags' results in a dereference of a null pointer
if (CHAIN_SPACE_LEN(*firstchainp) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../buffer.c:130:30: note: expanded from macro 'CHAIN_SPACE_LEN'
#define CHAIN_SPACE_LEN(ch) ((ch)->flags & EVBUFFER_IMMUTABLE ? \
Mike Frysinger [Fri, 13 Jun 2014 20:08:04 +0000 (16:08 -0400)]
libevent.pc: link against core/extra
Since we want people to stop using -levent, have the pkg-config file
also stop linking against that. This makes it easier to delete the
libevent.so library entirely.
Closes: #141
Azat Khuzhin [Sat, 27 Oct 2018 23:00:16 +0000 (02:00 +0300)]
bench_cascase: include getopt.h only for _WIN32 (like in other places)
Fixes: #561
Maya Rashish [Sat, 23 Sep 2017 03:57:16 +0000 (06:57 +0300)]
Define __EXT_POSIX2 for QNX
POSIX 1003.2 extension is necessary for getopt interface.
Reported here [1] (not mine, I can't test)
[1]: https://mail-index.netbsd.org/pkgsrc-users/2017/09/20/msg025601.html
Closes: #563 (cherry-pick)
Azat Khuzhin [Sat, 27 Oct 2018 16:34:52 +0000 (19:34 +0300)]
regress_ssl: reset static variables on test setup/cleanup and eliminate leaks
One tricky bit is reply to the BIO_C_GET_FD command, since otherwise it
will try to close(0) and accepted bev in ssl/bufferevent_connect_sleep
will leak. Other seems more or less trivial.
This was done to make sure that for at least generic cases does not
leak (tricky cases was listed here nmathewson/Libevent#83).
And this will allow run ssl/.. with --no-fork
Azat Khuzhin [Sat, 27 Oct 2018 16:41:52 +0000 (19:41 +0300)]
test: export basic_test_setup/basic_test_cleanup to extend them
Azat Khuzhin [Sat, 27 Oct 2018 20:58:18 +0000 (23:58 +0300)]
travis-ci: do not notify irc.oftc.net#libevent
I think that this just introduce noise that people just turns off. So
very questionable let's remove it.
Azat Khuzhin [Sat, 27 Oct 2018 15:35:08 +0000 (18:35 +0300)]
be_openssl: avoid leaking of SSL structure
From nmathewson/Libevent#83 by @fancycode:
There are a few code paths where the passed SSL object is not released in error cases, even if BEV_OPT_CLOSE_ON_FREE is passed as option while for others it is released. That way it's impossible for the caller to know it he has to free it on errors himself or not.
Line numbers are from "bufferevent_openssl.c" in
911abf3:
L1414 ("underlying == NULL" passed)
L1416 (bio could not be created)
L1446 (different fd passed)
L1325 (both underlying and fd passed)
L1328 (out-of-memory)
L1333 ("bufferevent_init_common_" failed)
In all error cases after the "bufferevent_ops_openssl" has been assigned, the option is evaluated on "bufferevent_free" (L1399) and the SSL object released (L1226).
Fixes: nmathewson/Libevent#83
Azat Khuzhin [Sat, 27 Oct 2018 15:29:57 +0000 (18:29 +0300)]
be_openssl: drop close_flag parameter of the BIO_new_bufferevent()
Azat Khuzhin [Sat, 27 Oct 2018 14:21:35 +0000 (17:21 +0300)]
Add evhttp_parse_query_str_flags()
And a set of flags:
- EVHTTP_URI_QUERY_LAST
- EVHTTP_URI_QUERY_NONCONFORMANT
Fixes: #15
Azat Khuzhin [Sat, 27 Oct 2018 14:36:09 +0000 (17:36 +0300)]
regress_http: basic evhttp_parse_query_str() coverage
Azat Khuzhin [Sat, 27 Oct 2018 11:58:30 +0000 (14:58 +0300)]
cmake: add various warning flags like autotools has
This is mostly to match autotools and reduce amount mixiing declarations
and code.
Added:
- -Wextra (the same as -W), -Wno-unused-parameter -Wstrict-aliasing
- -fno-strict-aliasing (gcc 2.9.5+)
- -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement (4.0+)
- -Waddress -Wno-unused-function -Wnormalized=id -Woverride-init (4.2+)
- -Wlogical-op (4.5+)
Removed:
- -Wformat (include in -Wall)
Plus use CMAKE_C_COMPILER_ID over CMAKE_COMPILER_IS_GNUCC, as
cmake-variables(7) suggesting, and add common GNUC/CLANG variables.
v2: drop checks for flags, since add_compiler_flags() will check if such
flags exists anyway (but just to note, gcc ignores non existing warning
flags by default).
Azat Khuzhin [Sat, 27 Oct 2018 13:49:39 +0000 (16:49 +0300)]
autotools: do not add warnings that is included into -Wall already
Plus remove duplicates
Murat Demirten [Mon, 4 Jun 2018 13:43:34 +0000 (16:43 +0300)]
listener: ipv6only socket bind support
According to RFC3493 and most Linux distributions, default value is to
work in IPv4-mapped mode. If there is a requirement to bind same port
on same ip addresses but different handlers for both IPv4 and IPv6,
it is required to set IPV6_V6ONLY socket option to be sure that the
code works as expected without affected by bindv6only sysctl setting
in system.
See an example working with this patch:
https://gist.github.com/demirten/
023008a63cd966e48b0ebcf9af7fc113
Closes: #640 (cherry-pick)
Azat Khuzhin [Wed, 24 Oct 2018 21:50:50 +0000 (00:50 +0300)]
Merge branch 'evutil_found_ifaddr-dev'
* evutil_found_ifaddr-dev:
Cover evutil_v4addr_is_local_()/evutil_v6addr_is_local_()
Split evutil_found_ifaddr() into helpers (evutil_v{4,6}addr_is_local())
Use INADDR_ANY over 0 in evutil_found_ifaddr()
Replace EVUTIL_V4ADDR_IS_*() macroses with static inline functions
Filter link-local IPv4 addresses in evutil_found_ifaddr()
Azat Khuzhin [Wed, 24 Oct 2018 21:25:48 +0000 (00:25 +0300)]
Cover evutil_v4addr_is_local_()/evutil_v6addr_is_local_()
Azat Khuzhin [Wed, 24 Oct 2018 21:01:59 +0000 (00:01 +0300)]
Split evutil_found_ifaddr() into helpers (evutil_v{4,6}addr_is_local())
Azat Khuzhin [Wed, 24 Oct 2018 20:47:01 +0000 (23:47 +0300)]
Use INADDR_ANY over 0 in evutil_found_ifaddr()
Azat Khuzhin [Wed, 24 Oct 2018 20:43:28 +0000 (23:43 +0300)]
Replace EVUTIL_V4ADDR_IS_*() macroses with static inline functions
Macros over static inline over and over again:
- readability
- type safety
Azat Khuzhin [Wed, 24 Oct 2018 08:51:57 +0000 (11:51 +0300)]
Filter link-local IPv4 addresses in evutil_found_ifaddr()
Fixes: #668
Azat Khuzhin [Mon, 22 Oct 2018 21:12:23 +0000 (00:12 +0300)]
Merge branch 'http-request-line-parsing'
* http-request-line-parsing:
Fix http https_basic/https_filter_basic under valgrind (increase timeout)
http: cover various non RFC3986 conformant URIs
http: allow non RFC3986 conformant during parsing request-line (http server)
http: do not try to parse request-line if we do not have enough bytes
http: allow trailing spaces (and only them) in request-line (like nginx)
http: cleanup of the request-line parsing
Azat Khuzhin [Mon, 22 Oct 2018 21:06:47 +0000 (00:06 +0300)]
Fix http https_basic/https_filter_basic under valgrind (increase timeout)
Azat Khuzhin [Mon, 22 Oct 2018 20:38:42 +0000 (23:38 +0300)]
http: cover various non RFC3986 conformant URIs
- http/basic_trailing_space -- covers cases when there is trailing space
after the request line (nginx handles this)
- http/simple_nonconformant -- covers non RFC3986 conformant URIs
Azat Khuzhin [Mon, 22 Oct 2018 20:52:46 +0000 (23:52 +0300)]
http: allow non RFC3986 conformant during parsing request-line (http server)
Reported-by: lsdyst@163.com
Azat Khuzhin [Mon, 22 Oct 2018 20:56:50 +0000 (23:56 +0300)]
http: do not try to parse request-line if we do not have enough bytes
Azat Khuzhin [Mon, 22 Oct 2018 20:56:19 +0000 (23:56 +0300)]
http: allow trailing spaces (and only them) in request-line (like nginx)
Azat Khuzhin [Mon, 22 Oct 2018 20:25:01 +0000 (23:25 +0300)]
http: cleanup of the request-line parsing
Azat Khuzhin [Sun, 21 Oct 2018 22:06:48 +0000 (01:06 +0300)]
Disable parallel jobs for the osx (due to CPU time deficit) in travis-ci
As you can see right now linux workers has zero failed tests, while osx
workers has 18 failed tests:
[bufferevent_connect_hostname_emfile FAILED]
[bufferevent_pair_release_lock FAILED]
[bufferevent_timeout FAILED]
[bufferevent_timeout_filter FAILED]
[bufferevent_timeout_pair FAILED]
[common_timeout FAILED]
[del_wait FAILED]
[immediatesignal FAILED]
[loopexit FAILED]
[loopexit_multiple FAILED]
[monotonic_res FAILED]
[no_events FAILED]
[persistent_active_timeout FAILED]
[persistent_timeout_jump FAILED]
[signal_switchbase FAILED]
[signal_while_processing FAILED]
[simpletimeout FAILED]
[usleep FAILED]
And this patch should remove from this list time related failures
(though maybe not all of them).
Azat Khuzhin [Sun, 21 Oct 2018 22:00:54 +0000 (01:00 +0300)]
Use matrix.fast_finish for the travis-ci to mark the build ASAP
AFAIR there is shortage of osx workers on travis-ci, IOW builds that
requires them can wait fair amount of time in the queue by just waiting.
Plus linux workers AFAICS can run multiple jobs in parallel (4-5), while
osx does not.
Hence if we do allow failures for osx (and right now they have a lot of
failed tests) let's mark build result based on tests under linux only.
So in a nut shell this will reduce build time from 5 hours to 20-30
minutes.
Azat Khuzhin [Sun, 21 Oct 2018 15:31:01 +0000 (18:31 +0300)]
Simplify bufferevent timeout tests to reduce CPU usage in between start/compare
Between start (setting "started_at") and comparing the time when
timeouts triggered with the start (test_timeval_diff_eq), there is too
much various things that can introduce extra delays and eventually could
fail the test on machine with shortage of CPU.
And this is exactly what happend on:
- travis-ci
- #262
Here is a simple reproducer that I came up with for this issue:
docker run --cpus=0.01 -e LD_LIBRARY_PATH=$PWD/lib -e PATH=/usr/bin:/bin:$PWD/bin -v $PWD:$PWD --rm -it debian:testing regress --no-fork --verbose bufferevent/bufferevent_timeout
Under limited CPU (see reproducer) the test almost always has problems
with that "write_timeout_at" exceed default timeval diff tolerance
(test_timeval_diff_eq() has 50 tolerance), i.e.:
FAIL ../test/regress_bufferevent.c:1040: assert(labs(timeval_msec_diff(((&started_at)), ((&res1.write_timeout_at))) - (100)) <= 50): 101 vs 50
But under some setup write timeout can even not triggered, and the
reason for this is that we write to the bufferevent 1024*1024 bytes, and
hence if evbuffer_write_iovec() will has some delay after writev() and
not send more then one vector at a time [1], it is pretty simple to
trigger, i.e.:
FAIL ../test/regress_bufferevent.c:1040: assert(labs(timeval_msec_diff(((&started_at)), ((&res1.write_timeout_at))) - (100)) <= 50):
1540155888478 vs 50
[1]: https://gist.github.com/azat/
b72773dfe7549fed865d439e03de05c1
So this patch just send static small payload for all cases (plus a few
more asserts added).
The outcome of this patch is that all regression tests passed on
travis-ci for linux box [2]. While before it fails almost always [3].
Also reproducer with CPU limiting via docker also survive some
iterations (and strictly speaking it should has less CPU then travis-ci
workers I guess).
[2]: https://travis-ci.org/azat/libevent/builds/
444391481
[3]: https://travis-ci.org/libevent/libevent/builds/
444336505
Bogdan Harjoc [Thu, 9 Aug 2018 10:04:52 +0000 (13:04 +0300)]
evdns: handle NULL filename explicitly
Otherwise we will try to open NULL filename and got EFAULT and anyway
will got the same return code from evdns_base_resolv_conf_parse_impl()
Closes: #680 (cherry-picked)
Azat Khuzhin [Sun, 21 Oct 2018 00:18:48 +0000 (03:18 +0300)]
Revert "travis-ci: use travis_retry to reduce number of problems with flacky tests"
That was a bad idea, because all this patch did is just uses extra CPU
time on travis-ci workers and eventually fail the build anyway.
It also increases time of executing one matrix entry (x3).
This reverts commit
7004ee8e869faabe3a284fb3d7eb859fb50ef90c.
Azat Khuzhin [Sun, 21 Oct 2018 00:15:34 +0000 (03:15 +0300)]
Merge branch 'regress-dns-fixes'
* regress-dns-fixes:
Do not rely on getservbyname() for most of the dns regression tests
Turn off dns/getaddrinfo_race_gotresolve by default
Fix an error for debug locking in dns/getaddrinfo_race_gotresolve
Azat Khuzhin [Sun, 21 Oct 2018 00:03:25 +0000 (03:03 +0300)]
Do not rely on getservbyname() for most of the dns regression tests
There is only one test that uses service name getaddrinfo_async, which
manually check whether it works or not, other should not assume that it
is available and works.
There was already an attempt to overcome some possible limitations, like
lack of "http" in /etc/services in
d6bafbbeb27ff3943d6f3b6783bcded76384c31e ("test/dns: replace servname
since solaris does not have "http"")
Azat Khuzhin [Sun, 21 Oct 2018 00:03:57 +0000 (03:03 +0300)]
Turn off dns/getaddrinfo_race_gotresolve by default
It is:
- pretty internal regression
- CPU bound
- right now failed on travis-ci machines
Azat Khuzhin [Sat, 20 Oct 2018 23:50:04 +0000 (02:50 +0300)]
Fix an error for debug locking in dns/getaddrinfo_race_gotresolve
When there is no /etc/services file evdns_getaddrinfo() will fail (with
service="ssh") and hence it will go to then "end" label with locked
rp.lock which in case of debug locking checks will bail with:
[err] ../evthread.c:220: Assertion lock->count == 0 failed in debug_lock_free
So add rp.locked flag, and unlock the lock before freeing it if it is in
locked state.
And here is how you can reproduce the issue:
$ docker run -e LD_LIBRARY_PATH=$PWD/lib -e PATH=/usr/bin:/bin:$PWD/bin -v $PWD:$PWD --rm -it debian:testing regress dns/getaddrinfo_race_gotresolve
(since debian:testing does not have /etc/services)
Jiri Luznicky [Wed, 23 May 2018 13:39:13 +0000 (15:39 +0200)]
Fix missing LIST_HEAD
Despite the presence of 'sys/queue.h' in some stdlib implementations
(i.e. uclibc) 'LIST_HEAD' macro can be missing. This fix defines this
macro in the same manner as was done previously for 'TAILQ_'.
Fixes: #539
Closes: #639 (cherry-picked)
Backport: 2.1.9
Azat Khuzhin [Thu, 18 Oct 2018 20:16:05 +0000 (23:16 +0300)]
Make cmake's check_const_exists() rely on cache
Azat Khuzhin [Wed, 17 Oct 2018 20:21:32 +0000 (23:21 +0300)]
Merge branch 'be-wm-overrun-v2'
* be-wm-overrun-v2:
Fix hangs due to watermarks overruns in bufferevents implementations
test: cover watermarks (with some corner cases) in ssl bufferevent
Fixes: #690
Azat Khuzhin [Wed, 17 Oct 2018 20:21:17 +0000 (23:21 +0300)]
Fix hangs due to watermarks overruns in bufferevents implementations
Some implementations of bufferevents (for example openssl) can overrun
read high watermark.
And after this if user callback will not drain enough data it will be
suspended (i.e. it will not be runned again anymore).
This is not the expecting behaviour as one may guess, since in this case
the data will never be read. Hence once we detected that the watermark
exceeded (even after calling user callback) we will schedule the
callback again.
This also can be fixed in bufferevent openssl implementation (by
strictly limiting how much data is added to the read buffer according to
read high watermark), but since this data is already available (and in
memory) there is no point in doing so.
Azat Khuzhin [Wed, 3 Oct 2018 22:03:10 +0000 (01:03 +0300)]
test: cover watermarks (with some corner cases) in ssl bufferevent
Azat Khuzhin [Wed, 17 Oct 2018 08:14:48 +0000 (11:14 +0300)]
Add -fdiagnostics-color=always for Ninja
Azat Khuzhin [Thu, 13 Sep 2018 23:24:44 +0000 (02:24 +0300)]
evrpc: avoid NULL dereference on request is not EVHTTP_REQ_POST
Fixes: #660
Carlo Marcelo Arenas Belón [Wed, 15 Aug 2018 20:57:01 +0000 (13:57 -0700)]
test: make sure pthread is defined
avoid warnings with any modern C99 compiler due to implicit function
declaration for pthread_create, as shown by the following :
test/regress_dns.c:2226:2: warning: implicit declaration of function
'pthread_create' is invalid in C99 [-Wimplicit-function-declaration]
THREAD_START(thread[0], race_base_run, &rp);
^
test/regress_thread.h:35:2: note: expanded from macro 'THREAD_START'
pthread_create(&(threadvar), NULL, fn, arg)
^
test/regress_dns.c:2226:2: warning: this function declaration is not a prototype
[-Wstrict-prototypes]
test/regress_thread.h:35:2: note: expanded from macro 'THREAD_START'
pthread_create(&(threadvar), NULL, fn, arg)
^
$ clang --version
Apple LLVM version 9.1.0 (clang-902.0.39.2)
Target: x86_64-apple-darwin17.7.0
Thread model: posix
InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
Closes: #686 (cherry-picked)
Azat Khuzhin [Sat, 18 Aug 2018 20:50:10 +0000 (23:50 +0300)]
appveyor: add all build tree into artifacts in case of failure
This will help in investigations of win32 failures...
P.S. looks like there is no better way, since
"artifacts.*.publish_on_failure" hadn't been implemented yet (while was
requiested in 2015).
Bogdan Harjoc [Thu, 9 Aug 2018 11:47:17 +0000 (14:47 +0300)]
dns-example: free result in getaddrinfo callback
According to evdns.c, the result not freed by libevent after
the callback runs:
evdns_getaddrinfo_gotresolve()
{
...
data->user_cb(0, data->pending_result, data->user_data);
data->pending_result = NULL;
...
}
To reproduce, build with -fsanitize=address, add -g to the getopt
list in dns-example.c like in the current commit and run
dns-example -g google.com
Closes: #681 # cherry-picked
Philip Prindeville [Sat, 16 Jun 2018 23:16:10 +0000 (17:16 -0600)]
Eliminate compiler warnings (at least for gcc/linux)
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #646 # cherry-picked from the PR
Azat Khuzhin [Thu, 2 Aug 2018 06:29:29 +0000 (09:29 +0300)]
Merge branch 'evdns_getaddrinfo-race-fix'
* evdns_getaddrinfo-race-fix:
evdns: add regress test for getaddrinfo race
evdns: fix race condition in evdns_getaddrinfo()
Merges: #673
Sergey Fionov [Thu, 2 Aug 2018 06:13:33 +0000 (09:13 +0300)]
evdns: add regress test for getaddrinfo race
Sergey Fionov [Wed, 1 Aug 2018 21:35:28 +0000 (00:35 +0300)]
evdns: fix race condition in evdns_getaddrinfo()
evdns_getaddrinfo() starts two parallel requests for A and AAAA record.
But if request is created from thread different from dns_base's, request of A record is
started immediately and may result in calling free_getaddrinfo_request() from
evdns_getaddrinfo_gotresolve() because `other_req' doesn't exist yet.
After that, request of AAAA record starts and finishes, and evdns_getaddrinfo_gotresolve()
is called again for structure that is already freed.
This commits adds locking into evdns_getaddrinfo() function.
Azat Khuzhin [Tue, 19 Jun 2018 07:15:08 +0000 (10:15 +0300)]
Cleanup __func__ detection
First of all __func__ is not a macro, it is char[] array, so the code
that we had before in cmake, was incorrect, i.e.:
#if defined (__func__)
#define EVENT____func__ __func__
#elif defined(__FUNCTION__)
#define EVENT____func__ __FUNCTION__
#else
#define EVENT____func__ __FILE__
#endif
So just detect do we have __func__/__FUNCTION__ in configure/cmake
before build and define EVENT__HAVE___func__/EVENT__HAVE___FUNCTION__
to use the later to choose which should be used as a __func__ (if it is
not presented).
Closes: #644
Azat Khuzhin [Wed, 1 Aug 2018 06:48:42 +0000 (09:48 +0300)]
Merge branch 'official/pr/671' -- README cleanup
* official/pr/671:
Capitalise project names consistently in README.md
Indent configure flag section to make markdown format them as code
Use https for resources that support it
Rewords awkward sentences in README.md
Fix typos in README.md
Azat Khuzhin [Tue, 31 Jul 2018 21:58:02 +0000 (00:58 +0300)]
autotools: include win32 specific headers for socklen_t detection on win32/mingw
The [1] removes EVENT__ prefix, and now if we will incorrectly detect
that "foobar" (or socklen_t in our case) type is not available, but
somewhere later it will be available then we will get next error [2]:
error: two or more data types in declaration specifiers
According to [3]:
- Compile something in Cygwin and you are compiling it for Cygwin.
- Compile something in MinGW and you are compiling it for Windows.
And I can confirm this, since there is _WIN32 defined (according to [4])
And since according to [5] our image in appveyour (Visual Studion 2015)
has mingw (and we use it, not cygwin) we need ws2tcpip.h (over
sys/socket.h -- which does not exist in win32) header to detect
socklen_t existence.
[1]:
587e9f5828c4eb3c6e79e9eb29f174e4ae0c05bd ("config.h can't be prefixed unconditionally")
[2]: https://ci.appveyor.com/project/nmathewson/libevent/build/job/yonukoc5q3tr3e5e#L372
[3]: https://stackoverflow.com/questions/771756/what-is-the-difference-between-cygwin-and-mingw
[4]: https://www.appveyor.com/docs/build-environment/#mingw-msys-cygwin
[5]: https://ci.appveyor.com/project/nmathewson/libevent/build/job/yonukoc5q3tr3e5e#L164
Fixes: #649
Aapeli [Wed, 1 Aug 2018 00:29:43 +0000 (10:29 +1000)]
Capitalise project names consistently in README.md
Aapeli [Wed, 1 Aug 2018 00:24:50 +0000 (10:24 +1000)]
Indent configure flag section to make markdown format them as code
Aapeli [Wed, 1 Aug 2018 00:21:57 +0000 (10:21 +1000)]
Use https for resources that support it
Aapeli [Wed, 1 Aug 2018 00:20:28 +0000 (10:20 +1000)]
Rewords awkward sentences in README.md
Aapeli [Wed, 1 Aug 2018 00:17:42 +0000 (10:17 +1000)]
Fix typos in README.md
Azat Khuzhin [Wed, 1 Aug 2018 00:01:43 +0000 (03:01 +0300)]
appveyor: disable almost all configurations (except autotools/cmake basic)
Since we have FREE plan, we have a lot of limits on our builds, so let's
reduce their amount to make them run/start faster (I hope).
Azat Khuzhin [Tue, 31 Jul 2018 21:44:58 +0000 (00:44 +0300)]
vagrant/win32: reduce amount of threads
Otherwise I got:
win: 855 [main] sh 840 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: /bin/sh: /usr/bin/sed: Input/output error
win: /bin/sh: line 1: /bin/sh: Input/output error
win: CC bufferevent_pair.lo
win: /bin/sh: fork: Input/output error
win: make[1]: *** [Makefile:1722: buffer.lo] Error 126
win: make[1]: *** Waiting for unfinished jobs....
win: CC bufferevent_ratelim.lo
win: 176 [main] sh 2440 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: /bin/sh: fork: Input/output error
win: 0 [main] sh 3684 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: ./libtool: fork: Input/output error
win: make[1]: *** [Makefile:1722: bufferevent_filter.lo] Error 254
win: 0 [main] sh 1356 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: ./libtool: fork: Input/output error
win: 0 [main] sh 3640 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: ./libtool: line 922: /usr/bin/sed: Input/output error
win: ./libtool: fork: Input/output error
win: 0 [main] sh 3444 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: 0 [main] sh 3796 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: ./libtool: fork: Input/output error
win: 693 [main] sh 304 fork: child -1 - CreateProcessW failed for 'C:\tools\cygwin\bin\sh.exe', errno 5
win: ./libtool: fork: Input/output error
win: ./libtool: fork: Input/output error
win: ./libtool: line 1377: /usr/bin/sed: Input/output error
win: : error: Failed to create '.libs'
Azat Khuzhin [Tue, 31 Jul 2018 21:28:48 +0000 (00:28 +0300)]
vagrant/win32: add missing aclocal
Xiaozhou Liu [Thu, 5 Jul 2018 03:25:24 +0000 (11:25 +0800)]
Fix typo
Closes: #658
Nathan French [Thu, 5 Jul 2018 16:46:51 +0000 (12:46 -0400)]
[http] fix C90 warnings
Philip Prindeville [Thu, 21 Jun 2018 05:47:51 +0000 (23:47 -0600)]
Tell Travis to use quiet git clone
Otherwise the logs show a bunch of pointless progress, which is
really only useful for interactive sessions.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #651 (cherry-picked)
Leo Zhang [Tue, 15 May 2018 04:14:05 +0000 (12:14 +0800)]
test: make regress_dns C89 compatible
Closes: #635 (cherry-picked)
Azat Khuzhin [Wed, 20 Jun 2018 23:37:24 +0000 (02:37 +0300)]
Ignore evconfig-private.h for autotools
Fixes: e2874d95af584b3657eb5dc1d2e5404811dce117 ("Adopt ignore rules for
cmake + ninja")
Azat Khuzhin [Tue, 19 Jun 2018 07:18:46 +0000 (10:18 +0300)]
Replace all EVENT_HAVE with EVENT__HAVE (EVENT__HAVE_USLEEP)