aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-07-15Merge branch 'dev' into majorMicael Karlberg
2011-07-15Merge branch 'maint-r14' into devMicael Karlberg
2011-07-13Merge branch 'dev' into majorSverker Eriksson
* dev: Fix small error in example code of gen_sctp documentation
2011-07-13Merge branch 'sverker/gen_sctp-open-docfix' into devSverker Eriksson
* sverker/gen_sctp-open-docfix: Fix small error in example code of gen_sctp documentation
2011-07-13Correct merge conflict mistake in parentSverker Eriksson
2011-07-13Merge branch 'dev' into majorSverker Eriksson
Conflicts: erts/emulator/test/nif_SUITE.erl erts/emulator/test/nif_SUITE_data/nif_SUITE.c sverker/enif_make_int64-halfword/OTP-9394
2011-07-13Merge branch 'sverker/enif_make_int64-halfword/OTP-9394' into devSverker Eriksson
* sverker/enif_make_int64-halfword/OTP-9394: Fix halfword bug in enif_make_int64
2011-07-12Merge branch 'dev' into majorSverker Eriksson
2011-07-12Merge branch 'maint-r14' into devSverker Eriksson
Conflicts: erts/vsn.mk
2011-07-12Merge branch 'bmk/snmp/agent/wrong_default_transport_domain/OTP-9425' into ↵Erlang/OTP
maint-r14 * bmk/snmp/agent/wrong_default_transport_domain/OTP-9425: [agent] Did not handle transport domains properly in some cases, for instance trap sending. OTP-9400 [agent] Wrong default transport domain, snmpUDPDomain, instead of transportDomainUdpIpv4. [agent] Did not handle transport domains properly in some cases, for instance trap sending.
2011-07-11Prepare releasemaint-r14b03Erlang/OTP
2011-07-11Merge branch 'rickard/sbmbc/OTP-9339' into maint-r14Erlang/OTP
* rickard/sbmbc/OTP-9339: Use separate memory carriers for small blocks
2011-07-11Merge branch 'sverker/ets_delete-deadlock-race/OTP-9423' into maint-r14Erlang/OTP
* sverker/ets_delete-deadlock-race/OTP-9423: Fix bug in ets:delete for write_concurrency that could lead to deadlock
2011-07-11Merge branch 'sverker/trace-ms-invalid-op/OTP-9422' into maint-r14Erlang/OTP
* sverker/trace-ms-invalid-op/OTP-9422: Fix a match-spec trace bug that could cause emulator crash
2011-07-11Merge branch 'dev' into majorSiri Hansen
2011-07-11Merge branch 'siri/stdlib/count_children_memory-notsup/OTP-9426' into devSiri Hansen
* siri/stdlib/count_children_memory-notsup/OTP-9426: Make sure supervisor_SUITE:count_children_memory is always skipped when erlang:memory is not supported
2011-07-11Merge branch 'dev' into majorSiri Hansen
2011-07-11Merge branch 'siri/sasl/delete-module-fail/OTP-9417' into devSiri Hansen
* siri/sasl/delete-module-fail/OTP-9417: Allow appup instruction delete_module module which is not loaded
2011-07-08Use separate memory carriers for small blocksRickard Green
2011-07-08Make sure supervisor_SUITE:count_children_memory is always skipped when ↵Siri Hansen
erlang:memory is not supported Replace the count_children_allocator_test with try erlang:memory in order to make sure there is no attempt at running this test case if erlang:memory is not supported.
2011-07-08[agent] Did not handle transport domains properly in some cases,Micael Karlberg
for instance trap sending. OTP-9400 [agent] Wrong default transport domain, snmpUDPDomain, instead of transportDomainUdpIpv4. OTP-9425
2011-07-08[agent] Wrong default transport domain, snmpUDPDomain, insteadMicael Karlberg
of transportDomainUdpIpv4. OTP-9425
2011-07-08[agent] Did not handle transport domains properly in some cases,Micael Karlberg
for instance trap sending. OTP-9400
2011-07-08Merge branch 'rickard/atomics-api/OTP-9014' into majorRickard Green
* rickard/atomics-api/OTP-9014: Use new atomic API in runtime system Improve ethread atomics
2011-07-08Merge branch 'lukas/erts/enif_make_reverse_list/OTP-9392' into majorLukas Larsson
* lukas/erts/enif_make_reverse_list/OTP-9392: Add version comment Rename enif_get_reverse_list to enif_make_reverse_list Remove extra allocated heap fragment Added enif_get_reverse_list to nif API
2011-07-07Fix a match-spec trace bug that could cause emulator crashSverker Eriksson
A trace matchspec with 'enable_trace' or 'disable_trace' in body could cause an emulator crash if a concurrent process altered the trace setting of the traced function by calling erlang:trace_pattern. The effect was a deallocation of the binary holding the matchspec program while it was running. Fixed by increasing reference count of ms-binary in the cases when 'enable_trace' or 'disable_trace' may cause a system block that may alter the ongoing trace. The paradox here is that db_prog_match() is using erts_smp_block_system() to do 'enable_trace' and 'disable_trace' in a safe (atomic) way. But that also have the (non-atomic) effect that racing thread might block the system and change the trace settings with erlang:trace_pattern.
2011-07-07Fix bug in ets:delete for write_concurrency that could lead to deadlockSverker Eriksson
Relocking in ets_delete_1() and remove_named_tab() was done by unlocking the table without clearing the is_thread_safe flag. A racing thread could then read-lock the table and then incorrectly write-unlock the table as db_unlock() looked at is_thread_safe to determine which kind of lock to unlock. Several fixes: 1. Make db_unlock() use argument 'kind' instead of is_thread_safe to determine lock type. 2. Make relock logic use db_lock() and db_unlock() instead of directly accessing lock primitives. 3. Do ownership transfer earlier in ets_delete_1 to avoid racing owner process to also start deleting the same table.
2011-07-07Merge branch 'dev' into majorIngela Anderton Andin
2011-07-07Merge branch 'maint-r14' into devIngela Anderton Andin
2011-07-07Merge branch 'dev' into majorHans Bolinder
* dev: Modify the contracts of the queue module
2011-07-07Merge branch 'hb/stdlib/queue_contracts/OTP-9418' into devHans Bolinder
* hb/stdlib/queue_contracts/OTP-9418: Modify the contracts of the queue module
2011-07-07Merge branch 'bjorn/remove-concat-binary/OTP-9421' into majorBjörn Gustavsson
* bjorn/remove-concat-binary/OTP-9421: Update preloaded modules Remove deprecated concat_binary/1
2011-07-07Allow appup instruction delete_module module which is not loadedSiri Hansen
The appup instruction 'delete_module' would cause a crash during upgrade if the module to be deleted was not loaded. The reason was that the release_handler tried to read the version number of the old module after the code path had changed to point to the new version of the application. Thus, if the module had not been loaded before the upgrade, there would no longer be any such module in the path (delete_module indicates that the module is deleted from the new version of the application). This is corrected by letting the release_handler read the old version of the module only if the module is updated - not if it is removed. And it is always read before the code path is changed.
2011-07-07Merge branch 'dev' into majorHans Bolinder
* dev: Fix bugs in xref(3)
2011-07-07Merge branch 'hb/tools/xref_doc_fixes/OTP-9416' into devHans Bolinder
* hb/tools/xref_doc_fixes/OTP-9416: Fix bugs in xref(3)
2011-07-07Merge branch 'dev' into majorHans Bolinder
* dev: Fix a bug in erl_scan:set_attribute/3
2011-07-07Merge branch 'hb/scanner_bug/OTP-9412' into devHans Bolinder
* hb/scanner_bug/OTP-9412: Fix a bug in erl_scan:set_attribute/3
2011-07-07Modify the contracts of the queue moduleHans Bolinder
The contracts of the queue module have been re-written as to avoid some issues concerning Dialyzer and opaque types.
2011-07-06Fix a bug in erl_scan:set_attribute/3Hans Bolinder
2011-07-06Update preloaded modulesBjörn Gustavsson
2011-07-06Remove deprecated concat_binary/1Björn Gustavsson
concat_binary/1 was deprecated in R13B04, but already in the R10B-2 release, the documentation recommends using list_to_binary/1 instead.
2011-07-06Merge branch 'ia/ssl/session-table-clean-up/OTP-9346' into maint-r14Erlang/OTP
* ia/ssl/session-table-clean-up/OTP-9346: The clean up of the session table now works as intended.
2011-07-06The clean up of the session table now works as intended.Ingela Anderton Andin
In ssl-4.1.5 temporary clean-up processes would crash resulting in that the session table would not be cleaned up (e.i. using more and more memory) and error reports would be printed, but connections would not be affected.
2011-07-06Merge branch 'dev' into majorSiri Hansen
2011-07-06Merge branch 'siri/sasl/new-app-vsn-path/OTP-9402' into devSiri Hansen
* siri/sasl/new-app-vsn-path/OTP-9402: Update code path for all applications that have new versions in a release
2011-07-06Merge branch 'dev' into majorHans Bolinder
* dev: Correct the contract of io_lib:fread/2,3
2011-07-06Merge branch 'hb/spec_bug/OTP-9413' into devHans Bolinder
* hb/spec_bug/OTP-9413: Correct the contract of io_lib:fread/2,3
2011-07-06Fix bugs in xref(3)Hans Bolinder
Thanks to Matthias Lang.
2011-07-06Merge branch 'dev' into majorIngela Anderton Andin
* dev: Added test case Improved test case so that it will not fail due to last_delay_timer = undefined
2011-07-06Merge branch 'ia/ssl/connect-twice' into devIngela Anderton Andin
* ia/ssl/connect-twice: Added test case