aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-03-21Merge branch 'maint'Hans Bolinder
* maint: Make sure disk_log does not write too much data
2012-03-21Merge branch 'hb/kernel/too_greedy_disk_log/OTP-9999' into maintHans Bolinder
* hb/kernel/too_greedy_disk_log/OTP-9999: Make sure disk_log does not write too much data
2012-03-21Merge branch 'maint'Hans Bolinder
* maint: Fix continuation error Remove unused file Correct a minor bug in qlc's testsuite
2012-03-21Merge branch 'hb/stdlib/fix_qlc_suite/OTP-10000' into maintHans Bolinder
* hb/stdlib/fix_qlc_suite/OTP-10000: Correct a minor bug in qlc's testsuite
2012-03-21Merge branch 'lars/xmerl/continuation-error/OTP-9961' into maintLars Thorsen
* lars/xmerl/continuation-error/OTP-9961: Fix continuation error
2012-03-21Fix continuation errorLars Thorsen
2012-03-21Merge branch 'lars/xmerl/remove-unused-file/OTP-9965' into maintLars Thorsen
* lars/xmerl/remove-unused-file/OTP-9965: Remove unused file
2012-03-21Remove unused fileLars Thorsen
2012-03-20Merge branch 'maint'Sverker Eriksson
2012-03-20Merge branch 'sverk/cpu-topology-crash' into maintSverker Eriksson
* sverk/cpu-topology-crash: erts: Fix memory corruption when reading topology info OTP-10004
2012-03-20Correct a minor bug in qlc's testsuiteHans Bolinder
2012-03-20Make sure disk_log does not write too much dataHans Bolinder
While disk_log eagerly collects logged data for better performance, collecting too much data may choke the system and cause huge binaries to be written. The problem was addressed in OTP-9764, but the situation was not improved in all cases. Thanks to Richard Carlsson.
2012-03-20Merge branch 'maint'Gustav Simonsson
2012-03-20Merge branch 'gustav/ic/remove-warnings' into maintGustav Simonsson
* gustav/ic/remove-warnings: Bump version from 4.2.29 to 4.2.30 Add generation of Erlang callback functions to avoid compiler warnings of generated Erlang source code Seq12023 OTP-9998
2012-03-20Bump version from 4.2.29 to 4.2.30Gustav Simonsson
2012-03-20Merge branch 'maint'Gustav Simonsson
2012-03-20Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/zlib.beam Rebuilt zlib.beam as part of this merge commit
2012-03-20Merge branch 'dc/dch-fix-win32-escript' into maintGustav Simonsson
* dc/dch-fix-win32-escript: add escript win32 alternative invocation (thanks Pierre Rouleau) OTP-9997
2012-03-20Merge branch 'sverk/zlib_port_leak' into maintSverker Eriksson
* sverk/zlib_port_leak: Fix port leaks in zlib OTP-9981
2012-03-20Merge branch 'maint'Gustav Simonsson
2012-03-20Merge branch 'ps/inet6-less-build-fix' into maintGustav Simonsson
* ps/inet6-less-build-fix: Add missing HAVE_IN6 && AF_INET6 ifdef OTP-9996
2012-03-20Merge branch 'maint'Micael Karlberg
2012-03-20Merge branch 'bmk/snmp/snmp422_integration/r15' into maintMicael Karlberg
2012-03-20Merge branch 'maint'Lukas Larsson
* maint: Fix reselecting bug on OS X Fix bug when sending long files using select Fix ifdef to check if we are on OS X Add test case for sending multiple small files on same connection Fix memory leak when sendfile process crashes Extend timeout for windows Skip sendfile suite if solaris 8
2012-03-20Merge branch 'lukas/kernel/sendfile_fixes' into maintLukas Larsson
* lukas/kernel/sendfile_fixes: Fix reselecting bug on OS X Fix bug when sending long files using select Fix ifdef to check if we are on OS X Add test case for sending multiple small files on same connection Fix memory leak when sendfile process crashes Extend timeout for windows Skip sendfile suite if solaris 8
2012-03-20Fix reselecting bug on OS XLukas Larsson
Since stop_select is called at an arbitrary point in the future it would sometime not be alled before the tcp driver started selecting on the fd. So now ERL_DRV_USE_NO_CALLBACK is used so that the stop_select call is never made. This seems to only have happened OS X.
2012-03-20Fix bug when sending long files using selectLukas Larsson
The return value from efile_sendfile was not consistent inbetween platforms. The API should now be working as it was intended. OTP-9994
2012-03-20Fix ifdef to check if we are on OS XLukas Larsson
2012-03-20Add test case for sending multiple small files on same connectionLukas Larsson
2012-03-20Fix memory leak when sendfile process crashesLukas Larsson
We use the fact that file_flush is called when there is data in the driver queue when a port is closed to ensure that all data is cleaned up as it should. OTP-9993
2012-03-20Extend timeout for windowsLukas Larsson
2012-03-20Merge branch 'maint'Peter Andersson
2012-03-20Merge remote branch 'origin/peppe/common_test/otp-9880_9986_9989' into maintPeter Andersson
* origin/peppe/common_test/otp-9880_9986_9989: Fix error with group config deleted before post_end_per_group Introduce new test suite for CTHs Fix bug in handling ct_hooks start arguments Use calls to ct_framework:init/end_per_suite for configuration Change ct_init/end_per_group to init/end_per_group Run hooks for non-existing config functions OTP-9880 OTP-9986 OTP-9989 OTP-9992
2012-03-20Merge branch 'maint'Björn Gustavsson
* maint: Improve erts_debug_SUITE Fix calculation of fun size in erts_debug:size/1
2012-03-20Merge branch 'bjorn/kernel/erts_debug_size-fix/OTP-9991' into maintBjörn Gustavsson
* bjorn/kernel/erts_debug_size-fix/OTP-9991: Improve erts_debug_SUITE Fix calculation of fun size in erts_debug:size/1
2012-03-20Improve erts_debug_SUITEBjörn Gustavsson
Test erts_debug:size/1 too. Also test funs and shared terms.
2012-03-19Merge branch 'maint'Björn-Egil Dahlberg
Conflicts: erts/preloaded/ebin/prim_inet.beam
2012-03-19Merge branch 'master' of super:otpBjörn-Egil Dahlberg
2012-03-19Merge branch 'ph/fix-enfile/OTP-9990' into maintBjörn-Egil Dahlberg
* ph/fix-enfile/OTP-9990: Update preloaded prim_inet.beam gen_tcp: Use correct specs for accept and listen prim_inet: Catch system_limit in open_port Fix returned error from gen_tcp:accept/1,2 when running out of ports
2012-03-19Fix calculation of fun size in erts_debug:size/1Björn Gustavsson
Funs would be calculated using erts_debug:flat_size/1.
2012-03-19Merge branch 'maint'Gustav Simonsson
2012-03-19Merge branch 'bmk/megaco/megaco31601_integration/r15' into maintMicael Karlberg
2012-03-19Fix error with group config deleted before post_end_per_groupPeter Andersson
OTP-9989 Also improve ct_hooks test suite.
2012-03-19Introduce new test suite for CTHsPeter Andersson
2012-03-19Fix bug in handling ct_hooks start argumentsPeter Andersson
2012-03-19Use calls to ct_framework:init/end_per_suite for configurationPeter Andersson
Now that calls to ct_framework:init/end_per_suite take place whenever init/end_per_suite is missing in the test suite, these calls should trigger init/end_tc to perform configuration (such as calling calling CTH functions, suite/0, etc).
2012-03-19Change ct_init/end_per_group to init/end_per_groupPeter Andersson
OTP-9986
2012-03-19Run hooks for non-existing config functionsPeter Andersson
2012-03-16Extend erlang:port_info/1,2 to show the OS pid of a spawned processMatthias Lang
When spawning OS (unix) processes with erlang:open_port, store the resulting unix pid so that it can be queried later on using erlang:port_info/1,2.
2012-03-16Update preloaded prim_inet.beamBjörn-Egil Dahlberg