aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-02-21Merge branch 'bjorn/erts/restore-cmp-arguments'Björn Gustavsson
* bjorn/erts/restore-cmp-arguments: beam/utils.c: Change back cmp() to only take two arguments
2014-02-21Merge branch 'nox/maps-erl_syntax-fix-docs'Björn-Egil Dahlberg
* nox/maps-erl_syntax-fix-docs: Mention map trees in erl_syntax:type/1 documentation
2014-02-21Merge branch 'egil/compiler/maps-get_map_elements'Björn-Egil Dahlberg
* egil/compiler/maps-get_map_elements: compiler: Strengthen Maps compile tests compiler: Remove dead warning erts: Fix erts_debug:disassemble/1 compiler: Transform list of Args to exact literal type compiler: Test Maps aliasing compiler: Use aliasing in map pair patterns compiler: Check literal order in beam_validator erts: Introduce new instructions for combined key fetches compiler: Change map instructions for fetching values
2014-02-21Merge branch 'rickard/doc-build/OTP-11713'Rickard Green
* rickard/doc-build/OTP-11713: Build documentation with bootstrap system
2014-02-21Merge branch 'rickard/otp_version/OTP-11615'Rickard Green
* rickard/otp_version/OTP-11615: Misc adjustments of OTP version
2014-02-21Merge branch 'dgud/mnesia/add-sync-log/OTP-11729'Dan Gudmundsson
* dgud/mnesia/add-sync-log/OTP-11729: mnesia: cleanup some dialyzer unmatched return warnings mnesia: Shorten testcase names mnesia: Improve mnesia coredump info mnesia: Add explicit sync_log command
2014-02-21Merge branch 'hb/kernel/spec_bug_fix/OTP-11730'Hans Bolinder
* hb/kernel/spec_bug_fix/OTP-11730: Correct the contract of inet:ntoa/1
2014-02-21Merge branch 'hb/stdlib/epp_bug_fix/OTP-11728'Hans Bolinder
* hb/stdlib/epp_bug_fix/OTP-11728: Fix a bug in epp concerning circular macro definitions
2014-02-20Merge branch 'hans/ssh/patch_1261/rbs'Hans Nilsson
* hans/ssh/patch_1261/rbs: fix calculation of variable thanks to Alexander Demidenko ssh: The server ssh_cli does not delay tty_geometry requests in case no tty is allocated ssh: fix 'known_hosts' bug in ssh_file ssh: Changed order of decode clauses to temp fix decode error ssh: Fixes memory crash Fix that result on stderr sent back to ssh:exec had length info present
2014-02-20Merge branch 'sverk/on_load-warning'Sverker Eriksson
* sverk/on_load-warning: erts: Add more details to warning in on_load docs
2014-02-20erts: Add more details to warning in on_load docsSverker Eriksson
2014-02-20Merge branch 'siri/restart_app-type/OTP-11716'Siri Hansen
* siri/restart_app-type/OTP-11716: [sasl] Use restart type from .rel when restarting apps during upgrade
2014-02-20Merge branch 'siri/appup_tests_17/OTP-11534'Siri Hansen
* siri/appup_tests_17/OTP-11534: Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib Update appups and appup tests for kernel, stdlib and sasl
2014-02-20compiler: Strengthen Maps compile testsBjörn-Egil Dahlberg
2014-02-20Correct the contract of inet:ntoa/1Hans Bolinder
Thanks to Max Treskin.
2014-02-20compiler: Remove dead warningBjörn-Egil Dahlberg
2014-02-20Fix a bug in epp concerning circular macro definitionsHans Bolinder
epp could loop when encountering a circular macro definition in an included file. Thanks to Maruthavanan Subbarayan for reporting the bug, and to Richard Carlsson for providing a bug fix.
2014-02-20Merge branch 'bjorn/cuddle-with-tests'Björn Gustavsson
* bjorn/cuddle-with-tests: With --enable-native-libs, skip eprof_SUITE:basic_option/1 Speed up bs_construct_SUITE:dynamic/1
2014-02-20With --enable-native-libs, skip eprof_SUITE:basic_option/1Björn Gustavsson
eprof does not work on native-compiled code. Since eprof_SUITE:basic_option/1 does profiling on the lists modules, the test case will fail if --enable-native-libs is used.
2014-02-20Speed up bs_construct_SUITE:dynamic/1Björn Gustavsson
The original test comes from the emulator test suite for testing binary syntax in the run-time system. Running interpreted it can be quite slow, especially when the system has been compiled with the configure option --enable-native-libs (probably because of very many context switches between native code and BEAM code). Speed up the test by scaling down the size of binaries from 128 bits to 64 bits. That should speed up the test roughly four times. By running the little and big endian tests in parallel we will cut that time in half. Thus all in all the test will run roughly 8 times faster.
2014-02-20mnesia: cleanup some dialyzer unmatched return warningsDan Gudmundsson
2014-02-20mnesia: Shorten testcase namesDan Gudmundsson
For windows tests (limited path lenghts)
2014-02-20mnesia: Improve mnesia coredump infoDan Gudmundsson
Add stacktrace of mnesia processes.
2014-02-20mnesia: Add explicit sync_log commandDan Gudmundsson
For performance reasons the file data is not synced to disk in mnesia, data loss can happen between each dump. mnesia:dump_log() can be used explicitly to ensure data is written to disk. But that can take a long time, so mnesia:sync_log() which just sync the log have been added.
2014-02-20Merge branch 'bjorn/asn1/cleanup/OTP-11727'Björn Gustavsson
* bjorn/asn1/cleanup/OTP-11727: asn1ct_check: Use a return value to silence a dialyzer warning asn1ct_check: Remove useless call to check_integer/3 asn1ct_check: Correct error handling for illegal OCTET STRING values asn1ct: Silence dialyzer warnings for unmatched returns asn1ct_table: Remove unused flexibility in table creation asn1ct_table: Silence a dialyzer warning for unmatched return asn1ct_gen: Silence dialyzer warnings for unmatched returns asn1ct_value: Silence a dialyzer warning for unmatched return asn1ct_tok: Check return value from file:close/1
2014-02-20Merge branch 'dgud/kernel/application-deadlock/OTP-11171'Dan Gudmundsson
* dgud/kernel/application-deadlock/OTP-11171: kernel: Fix an application terminate deadlock possibility
2014-02-20Merge branch 'dgud/runtime_tools/scheduler_wall_time_flags/OTP-11693'Dan Gudmundsson
* dgud/runtime_tools/scheduler_wall_time_flags/OTP-11693: runtime_tools: Do not turn off scheduler_wall_time
2014-02-20Merge branch 'fenollp/shell-expand-0arity-completely'Björn Gustavsson
* fenollp/shell-expand-0arity-completely: Correct parenthesis expansion Clean up edlin_expand_SUITE.erl to facilitate maintainance
2014-02-20Merge branch 'sverk/nif_SUITE-memleak'Sverker Eriksson
* sverk/nif_SUITE-memleak: erts: Fix memory leak in nif_SUITE:resource_takeover
2014-02-20erts: Fix memory leak in nif_SUITE:resource_takeoverSverker Eriksson
2014-02-20Merge branch 'lukas/tools/fix_maps_in_emacs_mode/OTP-11616'Lukas Larsson
* lukas/tools/fix_maps_in_emacs_mode/OTP-11616: tools: Update emacs mode with map highlights
2014-02-20Merge branch 'lukas/erts/dtrace-config-logging/OTP-11622'Lukas Larsson
* lukas/erts/dtrace-config-logging/OTP-11622: dtrace: Update dtrace docs with latest tested platforms erts: Fix dtrace generation on FreeBSD erts: Rewrite dtrace configure test
2014-02-19erts: Fix erts_debug:disassemble/1Björn-Egil Dahlberg
Now handles map instructions correctly.
2014-02-19Merge branch 'sverk/ets-all-race'Sverker Eriksson
OTP-11726 * sverk/ets-all-race: erts: Fix faulty asserts in erts_sys_aligned_alloc/free erts: Fix harmless (?) typo in beam_load.c erts: Fix race bug in ets:all/0
2014-02-19erts: Fix faulty asserts in erts_sys_aligned_alloc/freeSverker Eriksson
2014-02-19erts: Fix harmless (?) typo in beam_load.cSverker Eriksson
2014-02-19erts: Fix race bug in ets:all/0Sverker Eriksson
causing recently created/deleted tables to not be included/excluded.
2014-02-19Merge branch 'sverk/test_server/openbsd-dynlink'Sverker Eriksson
* sverk/test_server/openbsd-dynlink: erts: Skip driver_SUITE:thr_free_drv for VM without threads erts: Fix driver_SUITE:otp_9302 for VM without threads test_server: Fix dynlib link command for openbsd
2014-02-19Merge branch 'sverk/crypto/nomem-abort'Sverker Eriksson
OTP-11725 * sverk/crypto/nomem-abort: crypto: Abort VM if out of memory
2014-02-19Merge branch 'sverk/crypto/hmac-context-reuse-bug'Sverker Eriksson
OTP-11722 OTP-11724 * sverk/crypto/hmac-context-reuse-bug: crypto: Fix bug when using old hmac context erts: Fix NIF bug when load/upgrade fails after enif_open_resource_type Conflicts: erts/emulator/test/nif_SUITE.erl
2014-02-19compiler: Transform list of Args to exact literal typeBjörn-Egil Dahlberg
2014-02-19kernel: Fix an application terminate deadlock possibilityDan Gudmundsson
Could happen if get_child was called during terminate. io (since it is a group_leader) also causes problems after get_child was called. Split up and do it async.
2014-02-19compiler: Test Maps aliasingBjörn-Egil Dahlberg
2014-02-19compiler: Use aliasing in map pair patternsBjörn-Egil Dahlberg
2014-02-19compiler: Check literal order in beam_validatorBjörn-Egil Dahlberg
2014-02-19erts: Introduce new instructions for combined key fetchesBjörn-Egil Dahlberg
2014-02-19Build documentation with bootstrap systemRickard Green
Enables build of documentation in source trees that has been cross built
2014-02-19Misc adjustments of OTP versionRickard Green
2014-02-19beam/utils.c: Change back cmp() to only take two argumentsBjörn Gustavsson
Commit d5c238473b9cec819d93faaef4ccc00ddb60465f added a third argument to the cmp() function, but did not change the code generation of native code that called cmp(). Name the new functions with an "erts_" prefix, and reinstate the old cmp() function with two arguments. We don't have to keep a cmp() function in the halfword emulator, since HiPE does not support the halfword emulator.
2014-02-19Merge branch 'anders/diameter/sctp/OTP-11661'Anders Svensson
* anders/diameter/sctp/OTP-11661: Use inet:{peer,sock}names/1 in diameter_sctp