aboutsummaryrefslogtreecommitdiffstats
path: root/erts
AgeCommit message (Collapse)Author
2016-12-19Merge branch 'maint'Sverker Eriksson
2016-12-19Merge branch 'sverker/cuddle-port_SUITE' into maintSverker Eriksson
* sverker/cuddle-port_SUITE: erts: Fix faulty printout in port_SUITE
2016-12-19Merge branch 'maint'Björn-Egil Dahlberg
2016-12-19Merge branch 'legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112' into maintBjörn-Egil Dahlberg
* legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112: Remove vestiges of watchdog support in heart
2016-12-19Merge branch 'maint'Rickard Green
* maint: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process Conflicts: erts/emulator/beam/beam_emu.c erts/etc/unix/etp-commands.in
2016-12-19Merge branch 'rickard/stacktrace-bugs' into maintRickard Green
OTP-14055 * rickard/stacktrace-bugs: Remove faulty release note for these fixes New test cases testing stacktrace from apply on erlang:error() Fix stactrace for apply on error/[1,2], exit/1, or throw/1 Fix stack-trace generated by a traced process
2016-12-19Remove faulty release note for these fixesRickard Green
2016-12-19New test cases testing stacktrace from apply on erlang:error()Rickard Green
2016-12-19Fix stactrace for apply on error/[1,2], exit/1, or throw/1Rickard Green
2016-12-19Fix stack-trace generated by a traced processRickard Green
2016-12-19erts: Fix faulty printout in port_SUITESverker Eriksson
2016-12-16Merge branch 'maint'Sverker Eriksson
2016-12-16Merge branch 'sverker/cuddle-code_SUITE-versions' into maintSverker Eriksson
* sverker/cuddle-code_SUITE-versions: erts: Fix hanging race in code_SUITE:versions
2016-12-15Merge branch 'maint'Björn-Egil Dahlberg
2016-12-15Merge branch 'egil/erts/handle-sigterm-nicely/OTP-14085' into maintBjörn-Egil Dahlberg
* egil/erts/handle-sigterm-nicely/OTP-14085: erts: Document SIGTERM handler erts: Add SIGTERM signal handler
2016-12-15erts: Document SIGTERM handlerBjörn-Egil Dahlberg
2016-12-15Merge branch 'maint'Björn Gustavsson
* maint: Create CONTRIBUTING.md (#1278) Make sure that Travis fails when test cases fail Don't include problematic test cases in smoke test
2016-12-15Merge pull request #1277 from bjorng/bjorn/travis-run-testsBjörn Gustavsson
Make sure that Travis fails when test cases fail
2016-12-14Merge tag 'OTP-19.2'Dan Gudmundsson
=== OTP-19.2 === Changed Applications: - common_test-1.13 - compiler-7.0.3 - crypto-3.7.2 - dialyzer-3.0.3 - edoc-0.8.1 - erl_docgen-0.6.1 - erl_interface-3.9.2 - erts-8.2 - eunit-2.3.2 - hipe-3.15.3 - inets-6.3.4 - kernel-5.1.1 - mnesia-4.14.2 - observer-2.3 - odbc-2.12 - parsetools-2.1.4 - public_key-1.3 - runtime_tools-1.11 - sasl-3.0.2 - ssh-4.4 - ssl-8.1 - stdlib-3.2 - syntax_tools-2.1.1 - tools-2.9 - wx-1.8 Unchanged Applications: - asn1-4.0.4 - cosEvent-2.2.1 - cosEventDomain-1.2.1 - cosFileTransfer-1.2.1 - cosNotification-1.2.2 - cosProperty-1.2.1 - cosTime-1.2.2 - cosTransactions-1.3.2 - debugger-4.2.1 - diameter-1.12.1 - eldap-1.2.2 - et-1.6 - gs-1.6.2 - ic-4.4.2 - jinterface-1.7.1 - megaco-3.18.1 - orber-3.8.2 - os_mon-2.4.1 - otp_mibs-1.1.1 - percept-0.9 - reltool-0.7.2 - snmp-5.2.4 - typer-0.9.11 - xmerl-1.3.12 * tag 'OTP-19.2': Updated OTP version Prepare release Conflicts: OTP_VERSION
2016-12-12Don't include problematic test cases in smoke testBjörn Gustavsson
In time_SUITE, the univ_to_local/1 and local_to_univ/1 test cases will fail if they are run outside the CET timezone. The consistency/1 test case uses is not reliable in March and October because it uses a simplified model for when the switch to/from DST is done.
2016-12-09Merge margnus1/hipe-arm-trampoline/PR-1272/OTP-14088Sverker Eriksson
erts: Fix missing HiPE trampolines on arm (master only)
2016-12-09Prepare releaseErlang/OTP
2016-12-09Merge branch 'bjorn/crypto/support-openssl-1.1'Björn Gustavsson
* bjorn/crypto/support-openssl-1.1: Support OpenSSL 1.1.0 crypto.c: Disable broken code for ChaCha and Poly1305 configure.in: Fix configure test for usable OpenSSL configure.in: Fix test for SSL with Kerberos OTP-13900
2016-12-08erts: Fix hanging race in code_SUITE:versionsSverker Eriksson
Monitor first, then ask to terminate.
2016-12-07erts: Add SIGTERM signal handlerBjörn-Egil Dahlberg
A received SIGTERM signal to beam will generate a {'stop','stop'} message to the init process and terminate the beam nicely.
2016-12-07Update preloaded modulesErlang/OTP
2016-12-07Merge branch 'maint'Dan Gudmundsson
* maint: Update copyright-year Conflicts: lib/dialyzer/src/dialyzer.hrl lib/dialyzer/src/dialyzer_options.erl lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer.hrl lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer_races.erl lib/hipe/icode/hipe_icode.erl lib/hipe/main/hipe.erl lib/hipe/main/hipe.hrl.src lib/hipe/main/hipe_main.erl
2016-12-07Update copyright-yearErlang/OTP
2016-12-06erts: Fix missing HiPE trampolines on armMagnus Lång
8bb80fe76f5b replaced the "__arm__" macro used to test for the arm architecture in hipe_bif0 with the "arm" macro, which is not universally available. As this replacement is not motivated in the commit message, nor replicated in any other file that uses the "__arm__" macro, this seems to be an accident, and this commit reverts the replacement. When compiled in an environment without the "arm" macro, upgrading hipe code would occasionally not patch relocations to the new module due to being out of range for a shortjump, and a trampoline not being provided to do a longjump. Since this type of relocation patches are not expected to be able to fail, there is no error handling, and aside from a "hipe_redirect_to_module: patch failed" message, code upgrade would proceed and lead to various incorrect behaviour.
2016-12-05Merge branch 'sverker/secret-atom'Sverker Eriksson
2016-12-02erts: Remove unnecessary 'enable_lcnt' option in locksBjörn-Egil Dahlberg
2016-12-02erts: Fix whitespace errors in lock counterBjörn-Egil Dahlberg
2016-12-02erts: Add driver and nif locks to lcntBjörn-Egil Dahlberg
2016-12-02configure.in: Fix configure test for usable OpenSSLBjörn Gustavsson
In OpenSSL 1.1.0, HMAC_CTX no longer has a complete definition, and can no longer be allocated as a stack variable. Therefore, the code in the configure test for usable OpenSSL library will not compile. Call the HMAC() function instead since it exists in all versions of of OpenSSL that we support. Note that the code will only be compiled and linked, not run, so the argument values don't matter as long as they have the correct type.
2016-12-02configure.in: Fix test for SSL with KerberosBjörn Gustavsson
OpenSSL 1.1.0 and higher does not support Kerberos and no longer defines OPENSSL_NO_KRB5 to indicate that. Test the version number as well as OPENSSL_NO_KRB5.
2016-12-02Merge branch 'richcarl/default-compiler-flags/PR-1226/OTP-14071'Björn Gustavsson
* richcarl/default-compiler-flags/PR-1226/OTP-14071: stdlib test suite: fix uses of export_all diameter tests: Eliminate use of -compile(export_all) asn1 test suite: Suppress warnings for -compile(export_all) Remove left-over uses of -compile(export_all) Make warn_export_all the default warn_obsolete_guard is already default
2016-11-30Merge branch 'sverker/cuddle-hipe-fun-purge-test'Sverker Eriksson
* sverker/cuddle-hipe-fun-purge-test: erts: Fix race in code_SUITE:call_purged_fun_* erts: Refactor test code erts: Add ?line macro for some hipe testing
2016-11-30erts: Fix race in code_SUITE:call_purged_fun_*Sverker Eriksson
Must wait for process P0 to enter fun F2 before starting purge, to make sure it's not suspended.
2016-11-30erts: Refactor test codeSverker Eriksson
2016-11-30erts: Add ?line macro for some hipe testingSverker Eriksson
2016-11-29erts: Refactor BEAM_NIF_MIN_FUNC_SZSverker Eriksson
to be declared once in beam_load.h and get rid of #ifdef kludge.
2016-11-29erts: Use secret atom as sysname for ETS compressedSverker Eriksson
2016-11-29erts: Add erts internal secret atomSverker Eriksson
2016-11-29warn_obsolete_guard is already defaultRichard Carlsson
Update compiler documentation and remove superfluous erlc flags.
2016-11-28Merge branch 'sverker/nif-entry-abi-compat'Sverker Eriksson
* sverker/nif-entry-abi-compat: erts: Fix code_SUITE:api_2_0,upgrade crash on win64 erts: Add tests of nif API 2.0 erts: Change nif_SUITE to use binaries for raw pointers erts: Use test groups to repeat for different APIs erts: Add testing of old nif API erts: Secure abi backward compat for tracer nifs erts: Mend broken checks in nif_SUITE
2016-11-28Merge branch 'richcarl/code-change-utils/PR-1257/OTP-14059'Björn Gustavsson
* richcarl/code-change-utils/PR-1257/OTP-14059: Update preloaded modules Add shell mm() and lm() functions Add code:module_status/1 and modified_modules/0 Fix spec for erlang:get_module_info() Handle prefetched paths Restructure code:which() and where_is_file() Remove remnants of module package support
2016-11-26Update preloaded modulesBjörn Gustavsson
2016-11-25erts: Fix code_SUITE:api_2_0,upgrade crash on win64Sverker Eriksson
2016-11-25Merge branch 'maint'Rickard Green
* maint: Fix initialization dependencies between time, lock-check and lcnt
2016-11-25Merge branch 'rickard/init-bug/OTP-13911' into maintRickard Green
* rickard/init-bug/OTP-13911: Fix initialization dependencies between time, lock-check and lcnt Conflicts: erts/emulator/sys/unix/sys.c