aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
AgeCommit message (Collapse)Author
2016-12-20Merge branch 'mikpe/erts/system_info-atom_table/PR-1286/OTP-13976'Lukas Larsson
* mikpe/erts/system_info-atom_table/PR-1286/OTP-13976: erts: add erlang:system_info(atom_count)
2016-12-20erts: add erlang:system_info(atom_count)Mikael Pettersson
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'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-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-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-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-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-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-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-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-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
2016-11-23erts: Add tests of nif API 2.0Sverker Eriksson
2016-11-23erts: Change nif_SUITE to use binaries for raw pointersSverker Eriksson
2016-11-23erts: Use test groups to repeat for different APIsSverker Eriksson
2016-11-23erts: Add testing of old nif APISverker Eriksson
2016-11-23erts: Secure abi backward compat for tracer nifsSverker Eriksson
and simplify the code by handling the compatibility stuff at loading by creating modern struct copies in create_lib().
2016-11-23Merge branch 'maint'Sverker Eriksson
2016-11-23Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maintSverker Eriksson
again.
2016-11-23erts: Remove one little space in crash dumpSverker Eriksson
2016-11-23Merge branch 'maint'Rickard Green
* maint: Update etp-commands for dirty schedulers Fix scheduling of system tasks on processes executing dirty Fix call time tracing with dirty schedulers Fix send of exit signal to process executing dirty Fix dirty scheduler process priority Fix alloc-util hard-debug Silence debug warning when no beam jump table is used with dirty schedulers Fix check_process_code() when NifExport is in use Fix GC when NifExport is in use Fix saving of original arguments when rescheduling via NifExport Conflicts: erts/emulator/beam/beam_bif_load.c erts/emulator/beam/erl_nif.c
2016-11-23Merge branch 'rickard/dirty-scheduling-fixes' into maintRickard Green
OTP-14051 * rickard/dirty-scheduling-fixes: Update etp-commands for dirty schedulers Fix scheduling of system tasks on processes executing dirty Fix call time tracing with dirty schedulers Fix send of exit signal to process executing dirty Fix dirty scheduler process priority Fix alloc-util hard-debug Silence debug warning when no beam jump table is used with dirty schedulers Conflicts: erts/etc/unix/etp-commands.in
2016-11-23Merge branch 'rickard/nif-scheduling-fixes' into maintRickard Green
* rickard/nif-scheduling-fixes: Fix check_process_code() when NifExport is in use - OTP-14048 Fix GC when NifExport is in use - OTP-14049 Fix saving of original arguments when rescheduling via NifExport - OTP-14050
2016-11-22Fix scheduling of system tasks on processes executing dirtyRickard Green
2016-11-22Fix call time tracing with dirty schedulersRickard Green