aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-06-19Merge pull request #2110 from NattyNarwhal/aix-fixes/OTP-15866Lukas Larsson
Wake AIX up from coma
2019-06-19Merge branch 'maint'Hans Nilsson
* maint: crypto: Fix FIPS flags for MACs crypto: Fix FIPS flags for digests crypto: Fix FIPS flags for digests in HMAC crypto: Rename cipher fips macro
2019-06-19Merge branch 'hans/crypto/FIPS_macs/OTP-13872' into maintHans Nilsson
* hans/crypto/FIPS_macs/OTP-13872: crypto: Fix FIPS flags for MACs crypto: Fix FIPS flags for digests in HMAC
2019-06-19Merge branch 'hans/crypto/FIPS_digests/OTP-15911' into maintHans Nilsson
* hans/crypto/FIPS_digests/OTP-15911: crypto: Fix FIPS flags for digests crypto: Rename cipher fips macro
2019-06-19crypto: Fix FIPS flags for MACsHans Nilsson
2019-06-19crypto: Fix FIPS flags for digestsHans Nilsson
2019-06-19crypto: Fix FIPS flags for digests in HMACHans Nilsson
2019-06-19crypto: Rename cipher fips macroHans Nilsson
FORBIDDEN_IN_FIPS -> CIPHER_FORBIDDEN_IN_FIPS
2019-06-19Merge branch 'maint'Hans Nilsson
* maint: crypto: Fix bad link
2019-06-19Merge branch 'hans/crypto/cuddle_docs' into maintHans Nilsson
* hans/crypto/cuddle_docs: crypto: Fix bad link
2019-06-19crypto: Fix bad linkHans Nilsson
2019-06-19Merge branch 'maint'Ingela Anderton Andin
2019-06-19Merge branch 'ingela/ssl/TLS-hibernate-bug/OTP-15910' into maintIngela Anderton Andin
* ingela/ssl/TLS-hibernate-bug/OTP-15910: ssl: Fix hibernation bug
2019-06-18ssl: Fix hibernation bugIngela Anderton Andin
2019-06-18Merge branch 'maint'Kjell Winblad
2019-06-18Merge branch 'kjell/stdlib/ets_ordered_set_slow_react/OTP-15906' into maintKjell Winblad
* kjell/stdlib/ets_ordered_set_slow_react/OTP-15906: ETS ordered_set: Improvements to the CA tree implementation
2019-06-18ETS ordered_set: Improvements to the CA tree implementationKjell Winblad
This commit only affects the implementation of ETS `ordered_set` tables with the `write_concurrency` option enabled. Such tables are implemented with a data structure that is called the contention adapting search tree (CA tree). This commit introduces the following changes: * This commit causes a join to be triggered in one randomly selected base node in about one of 1000 read unlock calls for base node locks. No such joins happened before this commit. Before this commit, operations that only acquired looks in read-mode never triggered any contention adaptation. Therefore, the CA tree could get stuck in a sub-optimal state in certain scenarios. This could happen, for example, when a CA tree is first populated with parallel inserts (which will cause splits of base nodes) and then only read-only operations are applied to the data structure. Benchmark results from the `ets_SUITE:lookup_catree_par_vs_seq_init_benchmark/0` benchmark function (which is included in this commit) shows that this change can improve the throughput of the CA tree in the scenario described above. * Read-only operations will now also increase values of statistics counters when they detect that they need to wait for other operations. Only write operation changed statistics counters before this commit. This improves the statistics that the adaptation heuristics is based on. * Additionally, this commit adds an upper and lower limit to the contention statistics variables in the base nodes. Such limits did not exist before this commit. This should, for example, make the CA tree more responsive to contention after long periods of low contention.
2019-06-18Merge branch 'maint'Lukas Larsson
2019-06-18Merge pull request #2270 from essen/dist-get-stat-real-pend-value/OTP-15905Lukas Larsson
Return real pend value in erlang:dist_get_stat/1
2019-06-18Merge branch 'maint'John Högberg
* maint: alt_dist docs: Correct the mf_getstat description
2019-06-18Merge pull request #2271 from essen/alt-dist-getstat-non-zeroLukas Larsson
alt_dist docs: Correct the mf_getstat description
2019-06-18Merge branch 'john/compiler/fun-environment-types/OTP-15896'John Högberg
* john/compiler/fun-environment-types/OTP-15896: compiler: Propagate types of free variables
2019-06-18Merge branch 'john/compiler/cuddle-type-representation'John Högberg
* john/compiler/cuddle-type-representation: compiler: Add common method for literal -> type conversion
2019-06-18Merge branch 'maint'John Högberg
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION
2019-06-18Merge branch 'maint-22' into maintJohn Högberg
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-18Merge branch 'maint'Lukas Larsson
2019-06-18Merge pull request #2272 from ↵Lukas Larsson
garazdawi/lukas/erts/fix_active_n_close_win32/ERL-960/OTP-15901 Fix {active,N} close race condition on windows
2019-06-18Merge branch 'maint'John Högberg
* maint: Updated OTP version Prepare release
2019-06-18Merge branch 'maint-21' into maintJohn Högberg
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # lib/public_key/doc/src/notes.xml # lib/public_key/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-17Updated OTP versionOTP-22.0.4Erlang/OTP
2019-06-17Prepare releaseErlang/OTP
2019-06-17Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maint-22Erlang/OTP
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888: ssl: Fix negative tests in ssl_basic_SUITE ssl: Fix run_client_error/1 in ssl_test_lib ssl: Fix ssl_handshake:extension_value/1
2019-06-17Merge branch 'peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887' into maint-22Erlang/OTP
* peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887: ssl: Add interop test ssl: Improve handling of signature algorithms
2019-06-17Merge branch 'john/kernel/fix-io-proto-user-drv/OTP-15805' into maint-22Erlang/OTP
* john/kernel/fix-io-proto-user-drv/OTP-15805: kernel: Force synchronous port_commands in user/user_drv
2019-06-17Merge branch 'rickard/dist-exit2/22/OTP-15867' into maint-22Erlang/OTP
* rickard/dist-exit2/22/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch 'john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819' ↵Erlang/OTP
into maint-22 * john/erts/fix-xxx_to_existing_atom-overflow/ERL-944/OTP-15819: erts: Fix buffer overflow in xxx_to_existing_atom
2019-06-17Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint-22Erlang/OTP
* ingela/ssl/handshake-handling/ERL-968/OTP-15879: ssl: Correct handshake handling
2019-06-17Updated OTP versionOTP-21.3.8.4Erlang/OTP
2019-06-17Prepare releaseErlang/OTP
2019-06-17Merge branch 'rickard/dist-exit2/21/OTP-15867' into maint-21Erlang/OTP
* rickard/dist-exit2/21/OTP-15867: Don't disconnect on remote exit/2 with old incarnation as recipient
2019-06-17Merge branch ↵Erlang/OTP
'siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869' into maint-21 * siri/ct/fail-after-failed-init_per_testcase/maint-21/ERIERL-350/OTP-15869: [ct] Allow post_init_per_testcase to change skip to fail
2019-06-17Merge branch 'ingela/public_key/PEBS2-backport/OTP-15870' into maint-21Erlang/OTP
* ingela/public_key/PEBS2-backport/OTP-15870: public_key: Add AES to PBE2
2019-06-17Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint-21Erlang/OTP
* ingela/ssl/handshake-handling/ERL-968/OTP-15879: ssl: Correct handshake handling
2019-06-17Merge branch 'hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967' into maint-21Erlang/OTP
* hasse/stdlib/chars_limit_bug/OTP-15875/ERL-967: stdlib: Fix a bug concerning io_lib option 'chars_limit' # Conflicts: # lib/stdlib/test/io_SUITE.erl
2019-06-17Merge branch ↵Erlang/OTP
'siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863' into maint-21 * siri/ct/hook-terminated-not-initiated/maint-21/ERIERL-370/OTP-15863: [ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
2019-06-17Merge branch 'ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747' into maint-21Erlang/OTP
* ingela/raimo/udp-send-TOS/ERIERL-294/OTP-15747: Introduce udp send ancillary data argument down to inet_drv Fix old warnings
2019-06-17Merge branch ↵Erlang/OTP
'sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865' into maint-21 * sverker/erts/process-info-reductions-idle-proc/ERL-964/OTP-15865: erts: Improve test of process_info(reductions) Revert "erts: Force process_info(reductions) as signal"
2019-06-17Merge branch 'raimo/incomplete-socket-close/ERIERL-353/OTP-15370' into maint-21Erlang/OTP
* raimo/incomplete-socket-close/ERIERL-353/OTP-15370: Copy linger zero flag from listen socket Test linger zero flag from listen socket
2019-06-17Merge branch 'maint'Péter Dimitrov
* maint: ssl: Fix negative tests in ssl_basic_SUITE ssl: Fix run_client_error/1 in ssl_test_lib ssl: Fix ssl_handshake:extension_value/1
2019-06-17Merge branch 'peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888' into maintPéter Dimitrov
* peterdmv/ssl/fix-handshake-hello/ERL-975/OTP-15888: ssl: Fix negative tests in ssl_basic_SUITE ssl: Fix run_client_error/1 in ssl_test_lib ssl: Fix ssl_handshake:extension_value/1