aboutsummaryrefslogtreecommitdiffstats
path: root/erts
AgeCommit message (Collapse)Author
2012-11-23Merge branch 'maint'Patrik Nyblom
Conflicts: erts/doc/src/erlang.xml
2012-11-23Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maintPatrik Nyblom
* pan/process_info_spec_doc/r15/OTP-10584: Correct doc of process_info(Pid,links) OTP-10584
2012-11-23Merge branch 'pan/bs_append_crash' into maintPatrik Nyblom
* pan/bs_append_crash: Teach erts_bs_append not to dump core OTP-10590
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Update copyright yearsBjörn-Egil Dahlberg
2012-11-23Merge branch 'maint'Björn-Egil Dahlberg
2012-11-23Merge branch 'egil/fix-crash_dump-lc-assert' into maintBjörn-Egil Dahlberg
* egil/fix-crash_dump-lc-assert: erts: Suppress lock assertion when dumping a crash
2012-11-22Correct doc of process_info(Pid,links)Patrik Nyblom
2012-11-22Teach erts_bs_append not to dump corePatrik Nyblom
When erts_bs_append() calls the garbage collector, it has set the PB_ACTIVE_WRITER flag in the ProcBin for the binary object is about to be appended to. Therefore, it is expected that the garbage collector should neither move nor shrink the binary object. But if the garbage collector does a minor collection (thereby clearing the PB_ACTIVE_WRITER flag in the ProcBin) and there is still not enough heap space, there will be a second major garbage collection. During the major collection (since the the PB_ACTIVE_WRITER flag was cleared), the binary object may be shrunk or moved (depending on sizes and how many other writable binaries there are in the process). Avoid the problem by clearing the PB_ACTIVE_WRITER flags in a separate pass after the garbage collection(s). Thanks to Denis Titoruk for helping us find this bug.
2012-11-21Merge branch 'maint'Björn-Egil Dahlberg
2012-11-21Merge branch 'ph/erl_interface/check-thread-support/OTP-10581' into maintBjörn-Egil Dahlberg
* ph/erl_interface/check-thread-support/OTP-10581: Teach erl_interface configure more pthread support
2012-11-19Fix bad assertRickard Green
2012-11-16Merge branch 'pan/erlang-spec-error/open_port'Patrik Nyblom
* pan/erlang-spec-error/open_port: Fix spec for erlang:process_info/{1,2} Add 'hide' option to erlang:open_port/2 spec * Update preloaded erlang.beam OTP-10584 OTP-9684
2012-11-16Fix spec for erlang:process_info/{1,2}Patrik Nyblom
2012-11-16Add 'hide' option to erlang:open_port/2 specPatrik Nyblom
2012-11-16Merge branch 'maint'Rickard Green
* maint: Add clearer warnings about misuse of NIF and driver functionality Fix erlang:memory(ets) Conflicts: erts/emulator/beam/erl_db.c
2012-11-16Merge branch 'rickard/native-doc/OTP-10557' into maintRickard Green
* rickard/native-doc/OTP-10557: Add clearer warnings about misuse of NIF and driver functionality
2012-11-16Merge branch 'rickard/ets-mem-bug/OTP-10558' into maintRickard Green
* rickard/ets-mem-bug/OTP-10558: Fix erlang:memory(ets)
2012-11-16erts: Suppress lock assertion when dumping a crashBjörn-Egil Dahlberg
2012-11-15Add clearer warnings about misuse of NIF and driver functionalityRickard Green
2012-11-14Teach erl_interface configure more pthread supportPer Hedeland
- Teach lib/erl_interface/configure.in to look for pthreads support in libc (where it can be found on QNX) - A minor tweak such that this configure *fails* if you pass --enable-threads and no pthreads support can be found.
2012-11-14Merge remote branch 'upstream/maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/ssl_connection.erl
2012-11-13erts: Change assembler comment for hipe on x86 and amd64Sverker Eriksson
Previously done for ppc in c469d8ce14e9544a297d9af48c9da43137122d9a
2012-11-13erts: Fix compile error on solaris in generated hipe_amd64_bifs.SSverker Eriksson
2012-11-12Merge branch 'sverk/halfword-valgrind-suppressions' into maintSverker Eriksson
* sverk/halfword-valgrind-suppressions: crypto: Add valgrind suppression for AES_cbc_encrypt erts: Expand valgrind suppression for zlib Add extra valgrind suppression file for halfword emulator
2012-11-12Fix merge from maintRickard Green
2012-11-12Merge branch 'maint'Rickard Green
* maint: ssl: Adopt test case to not take so long Fix bug in erts_port_task_schedule() Use reduction limit in order to determine when to do wakeup Conflicts: erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c
2012-11-12Merge branch 'rickard/port-sched-bug/OTP-10556' into maintRickard Green
* rickard/port-sched-bug/OTP-10556: Fix bug in erts_port_task_schedule()
2012-11-12Merge branch 'rickard/sched-wakeup/OTP-10476' into maintRickard Green
* rickard/sched-wakeup/OTP-10476: Use reduction limit in order to determine when to do wakeup
2012-11-08Merge branch 'maint'Björn Gustavsson
* maint: Fix binary append exceptions
2012-11-08Merge branch 'bjorn/erts/binary-append/OTP-10524' into maintBjörn Gustavsson
* bjorn/erts/binary-append/OTP-10524: Fix binary append exceptions
2012-11-06Fix erlang:memory(ets)Rickard Green
2012-11-06Fix bug in erts_port_task_schedule()Rickard Green
2012-11-05Fix binary append exceptionsBjörn Gustavsson
Code such as the following should cause an exception: Bin = <<0:1>>, <<Bin/binary,...>> (Because the "binary" type implies that the binary must have a size in bits that is a multiple of 8.) Depending on the binary, either no exception was thrown or the wrong exception was thrown (because c_p->freason was not set). Noticed-by: Adam Rutkowski
2012-11-02Merge branch 'maint'Lukas Larsson
* maint: Skip ct_netconf tests if there is no crypto Migrate timers from test_server to ct interface Update tests to run with an oldshell emulator Move crypto check so that tc is skipped and not failed Update for new version of ppc compilation chain Verify that ebin folder of applications exists Conflicts: lib/asn1/test/asn1_SUITE.erl lib/kernel/test/interactive_shell_SUITE.erl
2012-11-02Merge branch 'lukas/rcs-ppc-cross-tests/OTP-10265' into maintLukas Larsson
* lukas/rcs-ppc-cross-tests/OTP-10265: Skip ct_netconf tests if there is no crypto Migrate timers from test_server to ct interface Update tests to run with an oldshell emulator Move crypto check so that tc is skipped and not failed Update for new version of ppc compilation chain Verify that ebin folder of applications exists
2012-11-02Fix oracle solaris bug in sendfileLukas Larsson
When using values of sfv_len and sfv_off which are larger than the file in question, sendfilev can sometimes return -1 and send data. It seems to be only Oracle SunOS which this happens on.
2012-10-31Merge branch 'raimo/IPV6_V6ONLY/OTP-8928'Raimo Niskanen
* raimo/IPV6_V6ONLY/OTP-8928: kernel: Document socket option ipv6_v6only kernel: Add test cases for socket option ipv6_v6only erts,kernel: Implement socket option ipv6_v6only in erlang code erts: Implement socket option IPV6_V6ONLY erts: Add configure test for IPV6_V6ONLY
2012-10-31erts,kernel: Implement socket option ipv6_v6only in erlang codeRaimo Niskanen
2012-10-31erts: Implement socket option IPV6_V6ONLYRaimo Niskanen
2012-10-26Merge branch 'bjorn/erts/beam_makeops'Björn Gustavsson
* bjorn/erts/beam_makeops: beam_makeops: Turn on warnings and eliminate existing warnings beam_makeops: Eliminate a deprecation warning
2012-10-24Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: erts/etc/common/heart.c
2012-10-24Merge branch 'egil/ensure-erl_crash.dump/OTP-10422' into maintBjörn-Egil Dahlberg
* egil/ensure-erl_crash.dump/OTP-10422: test: Relax timeouts for heart_SUITE erts: Fix crash dump write to port hack erts: Fix lock check assertion doc: Document ERL_CRASH_DUMP_SECONDS behaviour test: Add test for heart restart on crash test: Add test for heart restart on crash erts: Change ERL_CRASH_DUMP_SECONDS behaviour test: Refactor away ?line macros in heart_SUITE erts: Search for heart in ports that are alive heart: Refactor heart debugging erts, heart: Ensure erl_crash.dump is written
2012-10-23Merge branch 'sverk/valgrind-quoting'Sverker Eriksson
* sverk/valgrind-quoting: Make cerl -valgrind work with quoted spaces in command line
2012-10-23crypto: Add valgrind suppression for AES_cbc_encryptSverker Eriksson
Invalid write of size 8 (Address 0x84a63c0 is not stack'd, malloc'd or (recently) free'd) Suspected: AES_cbc_encrypt:??? (-> 0xD7489CF) [/lib/libcrypto.so.0.9.8]
2012-10-23erts: Fix crash dump write to port hackBjörn-Egil Dahlberg
More future proof with R16
2012-10-23erts: Fix lock check assertionBjörn-Egil Dahlberg
2012-10-22beam_makeops: Turn on warnings and eliminate existing warningsBjörn Gustavsson
2012-10-18doc: Document ERL_CRASH_DUMP_SECONDS behaviourBjörn-Egil Dahlberg
* heart reboot behaviour * erl_crash.dump file write behaviour
2012-10-18Merge branch 'jf/fix_sctp_peeloff_active_true'Henrik Nord
* jf/fix_sctp_peeloff_active_true: Set new peeled off SCTP socket to nonblocking socket SCTP test case with socket active options once and true OTP-10491