aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-09-19Use more correct delimiters for erl_nif.h includeTuncer Ayaz
Anywhere but the beam sources we shouldn't #include "erl_nif.h", because what "erl_nif.h" does is: (1) fail to find it outside of -I dirs, (2) then treat it as if it was written like <erl_nif.h>. Using <erl_nif.h> skips (1). More information can be found in 6.10.2 of the C standard. Because the examples use "erl_nif.h", NIF projects in the Erlang ecosystem copy this verbatim and make the same mistake.
2016-09-15Merge branch 'maint'Björn Gustavsson
* maint: erts: Add nif_SUITE:t_on_load erts: Improve nif_SUITE:upgrade test Don't leak old code when loading a modules with an on_load function Conflicts: erts/preloaded/ebin/erts_code_purger.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/src/erts_code_purger.erl
2016-09-15Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maintBjörn Gustavsson
* bjorn/erts/on_load/ERL-240/OTP-13893: erts: Add nif_SUITE:t_on_load erts: Improve nif_SUITE:upgrade test Don't leak old code when loading a modules with an on_load function
2016-09-15Merge branch 'maint'Björn Gustavsson
* maint: Ensure asserts are enabled in eunit.hrl
2016-09-15Merge branch 'richarl/eunit/fix-asserts/PR-1168/OTP-13892' into maintBjörn Gustavsson
* richarl/eunit/fix-asserts/PR-1168/OTP-13892: Ensure asserts are enabled in eunit.hrl
2016-09-15Merge branch 'maint'Peter Andersson
2016-09-15Merge branch 'peppe/common_test/docs-19.1' into maintPeter Andersson
* peppe/common_test/docs-19.1: Document functions for modifying and reading verbosity levels
2016-09-15Document functions for modifying and reading verbosity levelsPeter Andersson
2016-09-14Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2016-09-14Merge branch 'maint-19' into maintHenrik Nord
2016-09-14Merge branch 'maint'Björn-Egil Dahlberg
2016-09-14Merge branch 'tony612/erts/fix-doc-format-in-c_port/PR-1167/OTP-13885' into ↵Björn-Egil Dahlberg
maint * tony612/erts/fix-doc-format-in-c_port/PR-1167/OTP-13885: doc: Fix code format in tutorial/c_port
2016-09-14Merge branch 'maint'Björn-Egil Dahlberg
2016-09-14Merge branch 'mcherep/erts/fix-doc-typo/PR-1165/OTP-13886' into maintBjörn-Egil Dahlberg
* mcherep/erts/fix-doc-typo/PR-1165/OTP-13886: Typo in documentation fixed
2016-09-14Merge branch 'maint'Björn-Egil Dahlberg
* maint: Update .gitignore
2016-09-14Merge branch 'egil/update-gitignore' into maintBjörn-Egil Dahlberg
* egil/update-gitignore: Update .gitignore
2016-09-14Updated OTP versionOTP-19.0.7Erlang/OTP
2016-09-14Prepare releaseErlang/OTP
2016-09-14Merge branch 'rickard/gc-msgq-bin-fix/OTP-13890' into maint-19Erlang/OTP
* rickard/gc-msgq-bin-fix/OTP-13890: Ensure we dont use an invalid live heap fragment pointer Update vheap size when moving msgq to heap after GC
2016-09-14Merge branch 'maint'Peter Andersson
2016-09-14Merge branch 'peppe/kernel/invalid_priv_dir/ERL-195/OTP-13758' into maintPeter Andersson
* peppe/kernel/invalid_priv_dir/ERL-195/OTP-13758: Fix incorrect priv_dir when adding app's ebin directory to path OTP-13758
2016-09-14Merge branch 'peppe/common_test/verbosity_functions/OTP-13841' into maintPeter Andersson
OTP-13841
2016-09-14Ensure we dont use an invalid live heap fragment pointerRickard Green
2016-09-14Update vheap size when moving msgq to heap after GCRickard Green
2016-09-14erts: Add nif_SUITE:t_on_loadSverker Eriksson
2016-09-14erts: Improve nif_SUITE:upgrade testSverker Eriksson
to include upgrade from deleted (old) module instance
2016-09-14Don't leak old code when loading a modules with an on_load functionBjörn Gustavsson
Normally, calling code:delete/1 before re-loading the code for a module is unnecessary but causes no problem. But there will be be problems if the new code has an on_load function. Code with an on_load function will always be loaded as old code to allowed it to be easily purged if the on_load function would fail. If the on_load function succeeds, the old and current code will be swapped. So in the scenario where code:delete/1 has been called explicitly, there is old code but no current code. Loading code with an on_load function will cause the reference to the old code to be overwritten. That will at best cause a memory leak, and at worst an emulator crash (especially if NIFs are involved). To avoid that situation, we will put the code with the on_load function in a special, third slot in Module. ERL-240
2016-09-14Ensure asserts are enabled in eunit.hrlRichard Carlsson
When asserts were moved out to a separate header file, the automatic enabling of asserts when testing is enabled stopped working.
2016-09-14Merge branch 'maint'Björn Gustavsson
* maint: beam_validator: Handle unreachable instructions Turn off parallel make for start scripts Makefile
2016-09-14Merge branch 'bjorn/erts/start-scripts/ERL-250' into maintBjörn Gustavsson
* bjorn/erts/start-scripts/ERL-250: Turn off parallel make for start scripts Makefile
2016-09-14Merge branch 'bjorn/compiler/beam_validator/OTP-13863' into maintBjörn Gustavsson
* bjorn/compiler/beam_validator/OTP-13863: beam_validator: Handle unreachable instructions
2016-09-14Merge branch 'maint'Rickard Green
* maint: Ensure long enough sleep in driver_SUITE:timer_delay driver
2016-09-14Merge branch 'rickard/test-cuddle' into maintRickard Green
* rickard/test-cuddle: Ensure long enough sleep in driver_SUITE:timer_delay driver
2016-09-14Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release Fix crash due to heap fragments left after GC Conflicts: OTP_VERSION erts/emulator/beam/erl_gc.c
2016-09-14Merge branch 'maint-19' into maintHenrik Nord
2016-09-14Merge branch 'maint'Ingela Anderton Andin
2016-09-14Merge branch 'ingela/ssl/packet-tests' into maintIngela Anderton Andin
* ingela/ssl/packet-tests: ssl: Add timetrap scale calls ssl: Add nodelay to packet=0|raw tests
2016-09-13Updated OTP versionOTP-19.0.6Erlang/OTP
2016-09-13Prepare releaseErlang/OTP
2016-09-13Merge branch 'rickard/dist-map-gc-fix/OTP-13889' into maint-19Erlang/OTP
* rickard/dist-map-gc-fix/OTP-13889: Fix crash due to heap fragments left after GC
2016-09-13ssl: Add timetrap scale callsIngela Anderton Andin
2016-09-13Fix crash due to heap fragments left after GCRickard Green
Do not decode distribution messages as part of the GC operation. Distribution messages containing maps may generate heap fragments.
2016-09-13Export functions for setting and reading verbosityPeter Andersson
2016-09-13beam_validator: Handle unreachable instructionsBjörn Gustavsson
ab03678e introduced an optimization in the beam_z pass that could introduce unreachable code in BEAM files (a 'jump' instruction is removed after a 'raise' instruction, but the code following the target of the 'jump' is not removed). Since this situation happens very rarely, there is no point in adding another pass that can remove unreachable code after beam_z. Instead we will make sure that beam_validator can skip the unreachable code. Skipping unreachable code is already done in valfun_1/2 (for historical reasons), but we will also need to do it in val_dsetel/2.
2016-09-13Update .gitignoreBjörn-Egil Dahlberg
Ignore make/make_emakefile
2016-09-13Merge branch 'maint'Raimo Niskanen
2016-09-13Silence warnings in cryptoRaimo Niskanen
2016-09-13Merge branch 'maint'Hans Bolinder
* maint: parsetools: Suppress Dialyzer-warnings
2016-09-13Merge branch 'hasse/parsetools/suppress_dialyzer_warnings/OTP-13681' into maintHans Bolinder
* hasse/parsetools/suppress_dialyzer_warnings/OTP-13681: parsetools: Suppress Dialyzer-warnings
2016-09-13doc: Fix code format in tutorial/c_portTony Han