aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-08-22Merge branch 'bjorn/compiler/binary-literal-matching'Björn Gustavsson
* bjorn/compiler/binary-literal-matching: Reinstate optimization of binary literal matching Strengthen test case added in 8b83bc0b
2016-08-22Merge branch 'maint'Ingela Anderton Andin
2016-08-22Merge remote-tracking branch 'github/pr/1144' into maintIngela Anderton Andin
2016-08-22Merge branch 'maint'Ingela Anderton Andin
2016-08-22Merge branch 'ingela/ssl/ssl_npn_hello_SUITE_precondition' into maintIngela Anderton Andin
* ingela/ssl/ssl_npn_hello_SUITE_precondition: ssl: Check precondition for ssl_npn_hello_SUITE
2016-08-21Update httpd.xmlLinus.yuan
corrected some typo
2016-08-19Reinstate optimization of binary literal matchingBjörn Gustavsson
105c5b0071 was reverted in dd1162846e because clauses that were supposed to match would not match. (See 8b83bc0b.) Reintroduce the optimization, but make sure that we only shortcut bs_context_to_binary instructions and not bs_start_match2 instructions.
2016-08-19Strengthen test case added in 8b83bc0bBjörn Gustavsson
Don't only test the case that failed; test it exhaustively.
2016-08-19Merge branch 'maint'Sverker Eriksson
2016-08-19Merge branch 'sverker/net_kernel-setopts/OTP-13564' into maintSverker Eriksson
2016-08-19Merge branch 'maint'Dan Gudmundsson
* maint: wx: Add missing specs
2016-08-19Merge branch 'dgud/wx/broken-links' into maintDan Gudmundsson
* dgud/wx/broken-links: wx: Add missing specs
2016-08-19Merge branch 'maint'Dan Gudmundsson
* maint: Request a larger stacksize for wx thread
2016-08-19Merge branch 'dgud/wx/increase_wx_stacksize' into maintDan Gudmundsson
* dgud/wx/increase_wx_stacksize: Request a larger stacksize for wx thread
2016-08-18ssl: Check precondition for ssl_npn_hello_SUITEIngela Anderton Andin
2016-08-17Merge branch 'maint'Lukas Larsson
* maint: Updated OTP version Prepare release erts: Make sure to flush potential exit message
2016-08-17Merge branch 'maint-19' into maintLukas Larsson
* maint-19: Updated OTP version Prepare release erts: Make sure to flush potential exit message
2016-08-16Updated OTP versionOTP-19.0.5Erlang/OTP
2016-08-16Prepare releaseErlang/OTP
2016-08-16Merge branch 'lukas/kernel/os_cmd_fix_exit_message_leak/OTP-13813' into maint-19Erlang/OTP
* lukas/kernel/os_cmd_fix_exit_message_leak/OTP-13813: erts: Make sure to flush potential exit message
2016-08-16erts: Make sure to flush potential exit messageLukas Larsson
2016-08-15Update bootstrapSverker Eriksson
2016-08-15kernel: Document net_kernel:getopts and setoptsSverker Eriksson
2016-08-15kernel: Add erl_distribution_SUITE:setoptsSverker Eriksson
to test net_kernel:setopts and getopts.
2016-08-15kernel: Accept and convert old hs_data recordSverker Eriksson
2016-08-15kernel: Add net_kernel:setopts/2 and getopts/2Sverker Eriksson
2016-08-12Merge branch 'sverker/hipe-performance-algorithms/PR-1124/OTP-13810'Sverker Eriksson
2016-08-12Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release
2016-08-12Merge branch 'maint-18' into maintRickard Green
* maint-18: Updated OTP version Prepare release Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk otp_versions.table
2016-08-12Merge branch 'maint'Rickard Green
* maint: Updated OTP version Prepare release Avoid segfault when printing slogan after crashdumping Fix race causing lost wakeup on receive-after timeout Conflicts: OTP_VERSION
2016-08-12Merge branch 'maint-19' into maintRickard Green
* maint-19: Updated OTP version Prepare release Avoid segfault when printing slogan after crashdumping Fix race causing lost wakeup on receive-after timeout
2016-08-12Merge branch 'maint'Björn Gustavsson
* maint: asn1_test_lib: Compile ASN.1 modules in parallel Support 'make -j' when compiling ASN.1 modules [ERL-209] Fix ambiguous_catch_try_state inconsistency error
2016-08-12Merge branch 'bjorn/compiler/ambiguous_catch_try_state/ERL-209/OTP-13804' ↵Björn Gustavsson
into maint * bjorn/compiler/ambiguous_catch_try_state/ERL-209/OTP-13804: [ERL-209] Fix ambiguous_catch_try_state inconsistency error
2016-08-12Merge branch 'bjorn/asn1/support-parallel-build/OTP-13624' into maintBjörn Gustavsson
* bjorn/asn1/support-parallel-build/OTP-13624: asn1_test_lib: Compile ASN.1 modules in parallel Support 'make -j' when compiling ASN.1 modules
2016-08-12asn1_test_lib: Compile ASN.1 modules in parallelBjörn Gustavsson
Test that the changes in the previous commit allows us to compile ASN.1 modules in parallel.
2016-08-12Support 'make -j' when compiling ASN.1 modulesBjörn Gustavsson
When attempting to build multiple ASN.1 modules in parallel (e.g. by running 'make -j'), the ASN.1 compiler could crash because the names of the .asn1db files clashed. For example, if A.asn1 and B.asn1 both import from C.asn1, the compiler would write a C.asn1db file when compiling A.asn1 and when compiling B.asn1. We can avoid this problem if the compiler only writes the module's own .asn1db file. That is, when compiling A.asn1, the compiler would only write A.asn1db, not C.asn1db. Also, make sure that we make the write atomic by first writing to a temporary file that is then renamed.
2016-08-12Merge branch 'maint'Lukas Larsson
2016-08-12Merge branch 'lukas/erts/tracing/fix_sparc_align_issue/OTP-13803' into maintLukas Larsson
* lukas/erts/tracing/fix_sparc_align_issue/OTP-13803: erts: Align ErtsThrPrgrLaterOp when free'ing tracer
2016-08-12erts: Align ErtsThrPrgrLaterOp when free'ing tracerLukas Larsson
On Sparc all structs with a double word element in are assumed to be allocated on a two word boundary. So we have to make sure that the ErtsThrPrgrLaterOp * points to 8 / 16 byte aligned memory. As it only costs one word I've done it on all architectures in case some unknown other arch also needs this.
2016-08-12Merge branch 'maint'Lukas Larsson
2016-08-12Merge branch 'lukas/erts/fix_init_stop_code_load_race/OTP-13802' into maintLukas Larsson
* lukas/erts/fix_init_stop_code_load_race/OTP-13802: erts/kernel: Fix code loading deadlock during init:stop
2016-08-12erts/kernel: Fix code loading deadlock during init:stopLukas Larsson
When init:stop is called it walks the application hierarchy and terminates each process. Some of these processes may do something while terminating and sometimes that something needs to load some new code in order to work. When this happens the code_server could just be in the process of terminating or the erl_prim_loader could be active. In both these cases the request to load the new code would cause a deadlock in the termination of the system. This commit fixes this by init rejecting attempts to load new code when init:stop has been called and fixing a termination race in the code_server. This however means that the process that tried to do something when told to terminate (for instance logging that it is terminating) will crash instead of loading the code.
2016-08-12Merge branch 'maint'Lukas Larsson
Conflicts: lib/gs/doc/src/Makefile
2016-08-12Merge branch 'binarin/even-more-absolute-paths/PR-1103/OTP-13800' into maintLukas Larsson
* binarin/even-more-absolute-paths/PR-1103/OTP-13800: Use perl discovered by configure Don't make assumptions about build tools paths
2016-08-12Merge branch 'maint'Lukas Larsson
2016-08-12Merge branch 'avellable/erts/correct_atomicity_typo' into maintLukas Larsson
* avellable/erts/correct_atomicity_typo: Correct spelling of atomicity
2016-08-11kernel: Export inet types socket_getopt and socket_setoptSverker Eriksson
2016-08-11kernel: Refactor dist_util:con_loopSverker Eriksson
by separating the constant values into tuple ConData. and that exposed the fact that TcpAddress and MyNode where not used.
2016-08-11kernel: Cleanup code with fancy record syntaxSverker Eriksson
2016-08-11Updated OTP versionOTP-18.3.4.4Erlang/OTP