aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-10-20Merge branch 'kostis/hipe_bifs-add_ref/PR-1205'Sverker Eriksson
2016-10-20Merge branch 'maint'Sverker Eriksson
2016-10-20Merge branch 'sverker/ei_connect_xinit/PR-1202/OTP-13981' into maintSverker Eriksson
* sverker/ei_connect_xinit/PR-1202: use only two low bits of creation
2016-10-19Merge branch 'maint'Hans Bolinder
* maint: dbg:fun2ms: allow empty list as head
2016-10-19Merge branch 'gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974' into maintHans Bolinder
* gomoripeti/stdlib/ms_fix/PR-1203/OTP-13974: dbg:fun2ms: allow empty list as head
2016-10-19Merge branch 'maint'Raimo Niskanen
2016-10-19Merge branch 'raimo/gen_statem-improvements/OTP-13929' into maintRaimo Niskanen
* raimo/gen_statem-improvements/OTP-13929: Fix race condition in cancel_timer/1 Use parameterized types Implement state timeouts Improve docs and types Change state entry events into state enter calls Improve docs Improve docs Implement state entry events Implement call/3 dirty_timeout
2016-10-19Merge branch ↵Raimo Niskanen
'raimo/erts/fix-configure-to-check-in-libsct-for-sctp-funcs/ERL-262/OTP-13956' into maint * raimo/erts/fix-configure-to-check-in-libsct-for-sctp-funcs/ERL-262/OTP-13956: Configure enable libsctp dependency Revert "Check libsctp for sctp funcs in configure.in"
2016-10-19Merge branch 'gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976'Lukas Larsson
* gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976: erts: Fix some system_info docs inconsistencies Add system_info(atom_limit)
2016-10-18Restore the erroneously taken out assertionKostis Sagonas
2016-10-18Merge branch 'maint'Hans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_multiline_resp/PR-1196/OTP-13960' into maintHans Nilsson
2016-10-18Merge branch 'hans/inets/ftp_locks/OTP-13967' into maintHans Nilsson
2016-10-18Code cleanup to remove confusing assertionKostis Sagonas
The code of add_ref/6 contained an assertion that somehow appeared twice. Also, a recent commit (2b2de61) suppressed an unmatched return warning in a non-optimal way. By changing the return type of hipe_bifs:add_ref/2 to be 'ok' instead of [] the code can be cleaned up and simplified. While at it, fixed the wrong indentation of some nearby code.
2016-10-18Change the return type of hipe_bifs:add_ref/2Kostis Sagonas
2016-10-18Merge branch 'maint'Hans Nilsson
Conflicts: OTP_VERSION
2016-10-18Merge branch 'maint-19' into maintHans Nilsson
2016-10-18Merge branch 'maint'Lukas Larsson
2016-10-18Merge branch 'lukas/erts/etp-disasm' into maintLukas Larsson
* lukas/erts/etp-disasm: erts: Add etp-disasm gdb macro
2016-10-18erts: Add etp-disasm gdb macroLukas Larsson
2016-10-17Updated OTP versionOTP-19.1.5Erlang/OTP
2016-10-17Prepare releaseErlang/OTP
2016-10-17Merge branch 'hans/ssh/rekey_problem/OTP-13972' into maint-19Erlang/OTP
* hans/ssh/rekey_problem/OTP-13972: ssh: fix renegotiation problem ssh: test case for renegotiation with openssh client
2016-10-17ssh: fix renegotiation problemHans Nilsson
2016-10-17ssh: test case for renegotiation with openssh clientHans Nilsson
2016-10-17Merge branch 'maint'Björn-Egil Dahlberg
2016-10-17Merge branch 'egil/erl_docgen/reformat-docgen-encoding/OTP-13971' into maintBjörn-Egil Dahlberg
* egil/erl_docgen/reformat-docgen-encoding/OTP-13971: Reformat docgen xml encoding
2016-10-17Merge branch 'sverker/hipe-code-loadnpurge/OTP-13968'Sverker Eriksson
* sverker/hipe-code-loadnpurge: (35 commits) erts: Cleanup dead code kernel,hipe: Fix dialyzer warnings erts: Replace unsafe Module.first_hipe_ref erts: Disable DBG_TRACE_MFA for debug build kernel: Fix code_SUITE:upgrade for non-hipe erts: Cleanup hipe trampoline code erts: Remove dead alloc stats in hipe_amd64.c erts: Remove code_SUITE:make_stub and make_stub_many_funs erts: Let code:make_stub_module raise 'notsup' erts: Fix bug in stack walk on risc erts: Fix old leak for ppc hipe code erts: Fix old leak for arm hipe code erts: Fix old leak of sparc hipe code erts: Fix old leak of hipe code on x86 32-bit erts: Enable exec_alloc for all hipe architectures erts: Remove debug printout for hipe loader state erts: Free hipe_refs and hipe_sdesc of a failed load erts: Refactor out hipe_purge_refs/sdesc erts: Refactor hipe_loader_state_dtor into a true destructor hipe: TRY fix llvm external calls to own module ...
2016-10-17erts: Cleanup dead codeSverker Eriksson
2016-10-17kernel,hipe: Fix dialyzer warningsSverker Eriksson
2016-10-17Configure enable libsctp dependencyRaimo Niskanen
2016-10-14Merge branch 'sverker/proc-dict-atom-hash/PR-1194'Sverker Eriksson
* sverker/proc-dict-atom-hash: kernel: Add test pdict_SUITE:literals erts: Refactor process dict hash pre-calculation Use atom value as hash value in process dictionary
2016-10-14Merge branch 'sverker/fix-alloc-asserts'Sverker Eriksson
2016-10-14Merge branch 'maint'Ingela Anderton Andin
2016-10-14Merge branch 'ingela/ssl/tune-timeouts-basic_SUITE' into maintIngela Anderton Andin
* ingela/ssl/tune-timeouts-basic_SUITE: ssl: Tune timeout for old solaris machine
2016-10-14ssl: Tune timeout for old solaris machineIngela Anderton Andin
2016-10-14ftp: New DBG alternative: ct:palHans Nilsson
2016-10-14ftp: added forgotten inet:setopts active onceHans Nilsson
2016-10-14Merge branch 'master' into sverker/hipe-code-loadnpurgeSverker Eriksson
Conflicts: erts/emulator/beam/beam_bif_load.c erts/emulator/beam/beam_load.c and added macro DBG_TRACE_MFA_P in beam_load.h
2016-10-14erts: Replace unsafe Module.first_hipe_refSverker Eriksson
with hash table mod2mfa_tab
2016-10-14erts: Disable DBG_TRACE_MFA for debug buildSverker Eriksson
2016-10-14kernel: Fix code_SUITE:upgrade for non-hipeSverker Eriksson
2016-10-14erts: Cleanup hipe trampoline codeSverker Eriksson
2016-10-14ftp: socket wrapper changed suddenly and erroneouslyHans Nilsson
2016-10-14erts: Remove dead alloc stats in hipe_amd64.cSverker Eriksson
erlang:system_info({allocator, exec_alloc}) have stats if we need it.
2016-10-14erts: Remove code_SUITE:make_stub and make_stub_many_funsSverker Eriksson
Hard to unit test now when it takes a magic HipeLoaderState as argument. All hipe testing should be enough exercise for code:make_stub_module.
2016-10-14erts: Let code:make_stub_module raise 'notsup'Sverker Eriksson
if hipe is disabled. Makes the code simpler to just ifdef away a lot of hipe stuff.
2016-10-14erts: Fix bug in stack walk on riscSverker Eriksson
Symptom: Got ra==NULL at nsp==nsp_end when running basic_SUITE:basic_arith on arm why has this not been detected before?
2016-10-14erts: Fix old leak for ppc hipe codeSverker Eriksson
* Use erts_alloc(ERTS_ALC_T_HIPE_EXEC,_) * Each module has its own trampolines
2016-10-14erts: Fix old leak for arm hipe codeSverker Eriksson
* Use erts_alloc(ERTS_ALC_T_HIPE_EXEC,_) * Each module has its own trampolines * Stubs do not use trampolines, they do their own long jumps.