4145 Commits

Author SHA1 Message Date
Azat Khuzhin
db2efdf55e Merge branch 'EV_CLOSED-and-EV_ET-fixes'
* EV_CLOSED-and-EV_ET-fixes:
  Avoid triggering wrong events with EV_ET set
  epoll: handle EV_ET for EV_CLOSED too
  test: cover EV_CLOSED with lots of possible scenarious
  test: rename simpleclose to simpleclose_rw (since it works via write/read)

(cherry picked from commit c10cde4c617979e951352775a9685a47bf9c6acd)
2020-06-28 21:33:11 +03:00
Nicolas J. Bouliane
4dd3acddf8 bufferevent: allow setting priority on socket and openssl type
(cherry picked from commit bdc5200acdf0a004ddc805b87bf09439fe2ebe7f)
2020-06-28 21:33:11 +03:00
yuangongji
a6974d1132 cmake: set a default value for LIBEVENT_STATIC_LINK
(cherry picked from commit 86eafc03433cb5719e5b75ff99ffab8633433a17)
2020-06-28 21:33:11 +03:00
Nick Grifka
a821914368 evutil_time: improve evutil_gettimeofday on Windows
If present, use GetSystemTimePreciseAsFileTime instead of
GetSystemTimeAsFileTime. Available since Windows 8.

(cherry picked from commit f0b3160f8ce7fbd411493dcd023f562f4f9d17ee)
2020-06-28 21:33:11 +03:00
Nick Grifka
1fce771dc8 bench: Allow backend method selection
-l         list available methods
-m <name>  use method

(cherry picked from commit 5caffa7a5b3ce67e074e2ee99fc553c1cac0712c)
2020-06-28 21:33:11 +03:00
Azat Khuzhin
9ed49f2d64 cmake: missing test-closed binary
(cherry picked from commit 57862901095a97306e74b2944d5808051f813ed5)
2020-06-28 21:33:11 +03:00
Azat Khuzhin
f0ded5f313 Merge branch 'event_rpcgen.py-cleanup'
* event_rpcgen.py-cleanup:
  event_rpcgen.py: fix arguments-differ
  event_rpcgen.py: fix attribute-defined-outside-init
  event_rpcgen: suppress some warnings to make pylint clean
  Don't accumulate arguments in `Entry.GetTranslation`
  Fix improper string concatenations in lists
  Fix warnings regarding unused variables
  Don't override the `type` built-in
  Call `super` to call methods from the parent class
  Address `no-self-use` issues reported by pylint
  Run the code through the black formatter
  Reformat strings to template
  Add `argparse` support
  Precompile regular expressions
  Use bools instead of ints values where possible
  Rename all global variables to match the PEP8 spec
  Handle file pointers with context suite patterns
  Iterate over `tokens` with a for instead of while
  Fix indentation for `RpcGenError`
  Don't override `file` built-in
  Resolve variable name issues per PEP8
  Sort imports per PEP8

(cherry picked from commit dd02ad9544ec857412e8a5a0462ddcb29e8045f6)
2020-06-28 21:33:11 +03:00
yuangongji
13af9d263a cmake: replace CheckFunctionExists with CheckSymbolExists
Checking functions with `CheckFunctionExists` may
get wrong results, we should replace it with
`CheckSymbolExists`, which is recommended by the cmake
official documentation.
Before using `CheckSymbolExists`, we use
`CheckIncludeFiles` to check header files and save the
available header files in a variable that guarantees
`CheckSymbolExists` and `CheckTypeSize` to work correctly.
This approach is modeled after the cmake scripts of `curl`.

The following functions or files were not found before
modification, they can now be found:
- msys2 + mingw-8.1.0 on Windows10 or mingw-7.3.0 on Ubuntu-18.04
timerclear
timercmp
timerisset

- windows10
getaddrinfo
getnameinfo
getprotobynumber
getservbyname
putenv
strtoll
timerclear
timercmp
timerisset

- ubuntu-18.04
sys/sysctl.h
timeradd
timerclear
timercmp
timerisset

- MacOS 10.13
sys/random.h
timeradd
timerclear
timercmp
timerisset

(cherry picked from commit 41d1d75a84e03219ec037b0f7982a67fb031eae7)
2020-06-28 21:32:33 +03:00
Mario Emmenlauer
640f9cf6ec LibeventConfig.cmake: restore CMAKE_FIND_LIBRARY_SUFFIXES and LIBEVENT_STATIC_LINK default
The current cmake/LibeventConfig.cmake.in has a few problems and I'm not
sure how cleanly developed it is. It seems rater complex for the little
things I would assume it needs to do.

I found two problems that are fixed in this PR:

- If the downstream user does not explicitly set LIBEVENT_STATIC_LINK
  before calling find_package(libevent) then they will not be able to
  detect the static library, even if its the only one that exists. Since
  this may be rather strict, I've changed the behavior so that
  LIBEVENT_STATIC_LINK can be set to ON or OFF, but if unset, it defaults
  to whatever configuration libevent was built as.

- The other problem is a bug. The package configuration needs to unset
  CMAKE_FIND_LIBRARY_SUFFIXES after use, otherwise all packages that are
  detected after libevent will be "infected" by this setting. This was a
  significant problem for us, and is very hard to detect in downstream
  project, because the order of dependencies will lead to different search
  results.

(cherry picked from commit 1675a55620e6f0bbba5776f2df72cd48920421c2)
2020-06-28 21:32:33 +03:00
yuangongji
dea51c2e11 cmake: fix getaddrinfo checking error
Using `CheckFunctionExists` on Windows to check `getaddrinfo`
will get `not found`, but it actually exists. Using `CheckSymbolExists`
with headers will get correct results. Other functions such as
`getnameinfo`,`inet_ntop`,etc. have the same issue.

(cherry picked from commit 503ba1d36571e3cb01826d15dc462b7d8b5094de)
2020-06-28 21:32:33 +03:00
yuangongji
88384865be cmake: remove CheckFunctionExistsEx
`CheckFunctionExistsEx` is copied from the cmake modules before
3.1.2, which is the minimum required version of libevent.
The internal module `CheckFunctionExists`of cmake can completely
replace it.

(cherry picked from commit 61c5c19bfdabd2f16407a3ed615060c9d0502e82)
2020-06-28 21:32:23 +03:00
yuangongji
b9bf7fa71d autoconf: fix getaddrinfo checking errors on mingw
`AC_CHECK_FUNCS` can not properly check `getaddrinfo` because this
function requires some special headers on mingw.
Using `AC_CHECK_DECL` can effectively solve this issue.

Same for
- getnameinfo
- getprotobynumber
- getservbyname
- inet_ntop
- inet_pton

(cherry picked from commit 6d54be2cc078351b4ce1e469bedc4a976f4e3636)
2020-06-28 21:24:21 +03:00
Azat Khuzhin
e41a1969b0 test-time: do not use deprecated API
- event_init() -> event_base_new()
- event_set() -> event_new()
- check return value of event_base_dispatch()
- use EXIT_SUCCESS/EXIT_FAILURE

(cherry picked from commit 4e5a41ca0f668da1a18832e5cb02b4afeae074ff)
2020-06-28 21:24:21 +03:00
Azat Khuzhin
29e2c7f2b7 test-time: enable debug mode if EVENT_DEBUG_LOGGING_ALL env set
(cherry picked from commit a11edbfa369f7a99886359b3f4baa69686dc275f)
2020-06-28 21:24:21 +03:00
yuangongji
30662a3ca9 increase segment refcnt only if evbuffer_add_file_segment() succeeds
(cherry picked from commit 114b3836755f1e526e658b248464465136bd87b8)
2020-06-28 21:24:21 +03:00
ayuseleznev
6f8e0e97e5 evdns: fix a crash when evdns_base with waiting requests is freed
Fix undefined behaviour and application crash that might take
place in some rare cases after calling evdns_base_free when
there are requests in the waiting queue.

Current cleanup procedure in evdns_base_free_and_unlock
function includes 2 steps:
1. Finish all inflight requests.
2. Finish all waiting requests.
During the first step we iterate over each list in req_heads
structure and finish all requests in these lists. With current
logic finishing an inflight request (function request_finished)
removes it from the inflight requests container and forces
a wating connection to be sent (by calling
evdns_requests_pump_waiting_queue). When these new requests are
sent it is possible that they will be inserted to the list in
req_heads that we've already cleaned.
So in some cases container of the inflight requests is not empty
after this procedure and some requests are not finished and
deleted. When timeouts for these requests expire
evdns_request_timeout_callback is called but corresponding
evdns_base has been already deleted which causes undefined
behaviour and possible applicaton crash.

It is interesting to note that in old versions of libevent such
situation was not possible. This bug was introduced by the commit
14f84bbdc77d90b1d936076661443cdbf516c593. Before this commit
nameservers were deleted before finishing the requests. Therefore
it was not possible that requests from the waiting queue be sent
while we finish the inflight requests.

(cherry picked from commit 4da9f87ccbe71edb3b3aaf74b8b64d7e9c41dcaf)
2020-06-28 21:24:21 +03:00
chenguolong
2e9ceb1655 event_base_once: fix potential null pointer threat
supposing if base is null, EVBASE_ACQUIRE_LOCK and EVBASE_RELEASE_LOCK
would get a coredump, so we add a guard for protection.

Signed-off-by: chenguolong <cgl.chenguolong@huawei.com>
(cherry picked from commit 968bbd5c918568eb95b493af05c464ddfc36671b)
2020-06-28 21:24:21 +03:00
yuangongji
9e993c3cdb test-ratelim: add missing free
(cherry picked from commit 5fbe6313ae7e81cde3e056b29171a6346c54aa0b)
2020-06-28 21:24:21 +03:00
Azat Khuzhin
8a9b565501 Do not use shared global structures on CYGWIN
Fixes: #950
(cherry picked from commit 2c473056abdf710b6c476b7b19777d5313e71d8a)
2020-06-28 21:24:21 +03:00
Azat Khuzhin
0ef87f5f0e test: move thread into realtime class even on EVENT__DISABLE_THREAD_SUPPORT
(cherry picked from commit ca2b72c546d80dfb4fa255b20ef4a829ed102a70)
2020-06-28 21:24:17 +03:00
Azat Khuzhin
5a400c1f28 test: fix compilation without thread support (EVENT__DISABLE_THREAD_SUPPORT=ON)
(cherry picked from commit d0adbc05654eca27384b6496cfd8a22ed4dfb4fb)
2020-06-28 21:22:40 +03:00
Azat Khuzhin
1121ebed84 test: fix bufferevent/bufferevent_connect_fail_eventcb* under osx/freebsd
For OSX the socket should be closed, otherwise the "connection refused"
will not be triggered.

And freebsd can return error from the connect().

(cherry picked from commit 30fe125041ab38045487bd3af60d2f564dffc81c)
2020-06-28 21:22:40 +03:00
Azat Khuzhin
d5d18a5644 test: fix dst thread in move_pthread_to_realtime_scheduling_class (osx)
Fixes the following tests on osx:
- del_wait
- no_events

Refs: #940
(cherry picked from commit 10504fcab927e8b226ef2e988b1b3f175c3e9f71)
2020-06-28 21:22:40 +03:00
Azat Khuzhin
265cbe1077 test: fix compilation under win32 (rearrange thread_setup() code)
(cherry picked from commit 34d51e1bc9c650c4d012fe3024f7777c819ba969)
2020-06-28 21:22:37 +03:00
Azat Khuzhin
8991346df9 test: use THREAD_* wrappers over pthread* in del_notify
(cherry picked from commit 391003e9b78acff0ee5096c592fc4b601a02648d)
2020-06-28 21:22:03 +03:00
Azat Khuzhin
e85afbe3d5 Merge branch 'osx-clock'
Moves the thread into real-time scheduling class, as recommended in [1], it
fixes the separate test provided by @ygj6 [2] everywhere (github actions,
travis-ci, appveyor) under osx.

  [1]: https://developer.apple.com/library/archive/technotes/tn2169/_index.html
  [2]: dde1a6e4d0

Although even after this changes the following time-related tests failed
on travis-ci:
- no_events
- del_wait

But anyway I guess #940 can be closed, since this fixes the issue in common.

* osx-clock:
  test: Use THREAD_* wrappers in del_notify/del_wait
  test: move threads created with THREAD_START() to realtime scheduling class too
  test: put thread into real time scheduling class on osx for better latencies

Closes: #940
(cherry picked from commit a6f81aa45455c8afb69980f7026a0e706f4f9387)
2020-06-28 21:21:56 +03:00
Azat Khuzhin
677378ea42 cmake: do not print used method (EVENT_SHOW_METHOD) while running tests
autotools don't, plus this will make CI logs cleaner

(cherry picked from commit f8a6f12712e775720b36e0c4375a5fd6870bb737)
2020-06-28 21:20:52 +03:00
Azat Khuzhin
70ac214476 cmake: run regress test quietly like autotools (makes CI logs cleaner)
(cherry picked from commit fa33819e3b0f706a0c8b6bcb6eb2c6646609542a)
2020-06-28 21:20:52 +03:00
Azat Khuzhin
e24242299b Merge branch 'http-connect'
After this patchset http-connect works with pproxy [1]:

    $ pproxy -l http://:8000/ -vvv &
    $ http-connect //127.1:8000 http://kernel.org:80/

  [1]: https://pypi.org/project/pproxy/

* http-connect:
  http-connect: do not check connection on GET cb
  http-connect: set Host header (for CONNECT and GET) (like curl)
  http-connect: cleanup and helpers
  http: do not close connection for CONNECT
  http: do not assume body for CONNECT

Fixes: #946
(cherry picked from commit 462f2e97660cc2b6af563ab631050a83c3e0935b)
2020-06-28 21:20:52 +03:00
Azat Khuzhin
1b42270b7a http: do not assume body for CONNECT
(cherry picked from commit 998e68340e5cd289a16f340cc5c625e984e1f762)
2020-06-28 21:20:52 +03:00
Dimo Markov
3f1fb1f9ab Added uninstall target check to cmakelists
(cherry picked from commit f0e79bafd8823aedf535e9b344d4cf9a4f9747e5)
2020-06-28 21:20:52 +03:00
Azat Khuzhin
921bdcdd81 Fix compilation without OPENSSL_API_COMPAT
Use the following for openssl 1.1+:
- X509_getm_notBefore over X509_get_notBefore
- X509_getm_notAfter  over X509_get_notAfter
- use OPENSSL_VERSION_NUMBER over SSLeay()
- add missing headers

Refs: openssl/openssl@0b7347effe
(cherry picked from commit 08981f8d752ad23e21887b42944783e843b2e281)
2020-06-28 21:20:46 +03:00
yuangongji
d42240d1c6 evutil_time: Implements usleep() using wait funtion on Windows
(cherry picked from commit 6412f34f242e9b5b87f0378715baf97ba0bf1a8c)
2020-06-28 21:19:54 +03:00
yangyongsheng
d9da412658 Initialize variable to 0 replace use memset function in sample/hello-world.c
(cherry picked from commit 1edb6f6188d5dd2155c6e8ad997eaca11157e95f)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
2db851a980 cmake: set CMAKE_{RUNTIME,LIBRARY,ARCHIVE}_OUTPUT_DIRECTORY they are not defined
This will allow overriding them in parent cmake rules, i.e. if libevent
is used via add_subdirectory().

Closes: #931
(cherry picked from commit 8f13c170cf6e9a02dec410b967884ec5e08947ab)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
47eb8c1208 cmake: use CMAKE_LIBRARY_OUTPUT_DIRECTORY for the final shared library symlink
Fixes: 669a53f3 ("cmake: set library names to be the same as with autotools")
(cherry picked from commit b9f442e2d7af8b01cd34f75f2f404763b76d42dc)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
8ad26d0b11 test-ratelim: calculate timers bias (for slow CPUs) to avoid false-positive
This can be/should be done for regression tests too.

Refs: https://ci.appveyor.com/project/libevent/libevent/builds/28916689/job/kg621aa194a0qbym
Refs: https://github.com/libevent/libevent/pull/917#issuecomment-553811834
v2: EVENT_BASE_FLAG_PRECISE_TIMER
(cherry picked from commit 8a34869984c470fb243fc9587c469b316add2f7e)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
ffc528e99f mailmap: add name/email aliases for yuangongji (name and email)
Before:
  $ git log --format='%aE %aN' --author=yuangongji | sort | uniq -c
       30 82787816@qq.com yuangongji
        1 82787816@qq.com yuangongji (A)

After:
  $ git log --format='%aE %aN' --author=yuangongji | sort | uniq -c
       34 yuangongji@foxmail.com yuangongji
(cherry picked from commit 026590f908f8ef8602d54bd680c8bef9f4552d55)
2020-06-28 21:19:54 +03:00
yuangongji
baec84f28a cmake: test for find_package()
(cherry picked from commit cd15112b620feadafe8fd3531043870a5c19a4a6)
2020-06-28 21:19:54 +03:00
yuangongji
1c047618ba cmake: improve package config file
(cherry picked from commit dc4be869d5009f38e0ef02ff07dd799f9c2fef2f)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
976f7d34ff Link with iphlpapi only on windows
Fixes: 9fecb59a ("Parse IPv6 scope IDs.")
Refs: #923
(cherry picked from commit 1495f8b67a6061ac5c8dcbc42dd71398d6355c9a)
2020-06-28 21:19:54 +03:00
Philip Homburg
f602211fa1 Parse IPv6 scope IDs.
(cherry picked from commit 9fecb59a94ef246088d7f3e0365c2fe80d0df2f4)
2020-06-28 21:19:54 +03:00
Azat Khuzhin
ca92a7559e Relax bufferevent_connect_hostname_emfile
Do not do any assumptions on the error for the EMFILE from
getaddrinfo(), expect just any error.

Fixes: #924
(cherry picked from commit 4436287d1247fb2e9c80560debf852a94657e485)
2020-06-28 21:19:42 +03:00
yuangongji
93174bb537 autotools: fails build when need but can not find openssl
(cherry picked from commit 53b3be4ee9e814a22876675c0ee004f0ebfb8535)
2020-06-28 21:17:33 +03:00
yuangongji
a9d1121d16 cmake: eliminate duplicate installation of public headers
(cherry picked from commit 5fe83d7433022e29a401753f64ec78faaf25e0a7)
2020-06-28 21:17:33 +03:00
Michael Davidsaver
87c6f7358e append to CMAKE_MODULE_PATH
Don't override any -DCMAKE_MODULE_PATH= passed from CLI
to eg. test custom Platform/ support.

(cherry picked from commit 84affc1837a727640f46eff2723c1364d2cd1695)
2020-06-28 21:17:33 +03:00
Azat Khuzhin
d2871a37bf Do not use sysctl.h on linux (it had been deprecated)
It had been deprecated for a long time (AFAIK), but since
glibc-2.29.9000-309-g744e829637 it produces a #warning

(cherry picked from commit b9b9f19058dc04b7ad4d079a38f6b86c0e7b1072)
2020-06-28 21:17:33 +03:00
yuangongji
e35e02e680 sample/https-client: link crypt32 explicitly when build with mingw-w64
(cherry picked from commit 78b5bca6d83a70a0b9dfc438898d5c1908cc3c2a)
2020-06-28 21:17:33 +03:00
Kamil Rytarowski
5febb4e191 Fix compat with NetBSD >= 10
kevent::udata was switched from intptr_t to void*.

Handle both cases with the GCC extension typeof().

(cherry picked from commit 72e6eff0251bffec72e0b8b2cedf72f173c8b9e9)
2020-06-28 21:17:33 +03:00
William A Rowe Jr
50b9be003c Avoid transforming base C_FLAGS set deliberately
The CMAKE_C_FLAGS_DEBUG, CMAKE_C_FLAGS_RELEASE, CMAKE_C_FLAGS_MINSIZEREL
and CMAKE_C_FLAGS_RELWITHDEBINFO options are correctly and deliberately
toggled to use the libcmt (/MT) flag options in place of the usual
msvcrt (/MD) options, but this isn't necessarily desired by the user.
The default choice can be overriden with the EVENT__MSVC_STATIC_RUNTIME
cmake option.

However, the /MD flag that is the choice of CMake only enters into
play for the four types of builds above. If the user introduces another
CMAKE_BUILD_TYPE, the base CMAKE_C_FLAGS must not be manipulated, as
that value (and the CMAKE_C_FLAGS_{custom} value) have been explicitly
chosen by the user/developer deploying this library, and the mismatch
between these flags in different dependencies results in link errors.

The CMake build schema itself doesn't place an /MD flag in CMAKE_BUILD_TYPE
so any /M compile option in that variable needs to be retained.

Signed-off-by: William Rowe <wrowe@pivotal.io>
Signed-off-by: Yechiel Kalmenson <ykalmenson@pivotal.io>
(cherry picked from commit af4b07a55cc0ff0298cbd26c87b3f6a08f84c394)
2020-06-28 21:17:33 +03:00