aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-04-18Merge branch 'maint'Patrik Nyblom
Conflicts: lib/hipe/cerl/erl_bif_types.erl
2012-04-18Revert "Extend erlang:port_info/1,2 to show the OS pid of a spawned process"Patrik Nyblom
This reverts commit d4667d383964c1550e0a91d64b674e84f6d07e3b. This commit was included by mistake, the correct patch will be merged from maint.
2012-04-17Merge branch 'egil/inet-fix-doc-typos' into maintBjörn-Egil Dahlberg
* egil/inet-fix-doc-typos: doc: Add 'is' to explanation of callback modules doc: Fix typo in inet
2012-04-17doc: Add 'is' to explanation of callback modulesBjörn-Egil Dahlberg
2012-04-17doc: Fix typo in inetBjörn-Egil Dahlberg
2012-04-17Merge branch 'pg/r15/add-os-pid-to-port-info' into maintPatrik Nyblom
* pg/r15/add-os-pid-to-port-info: tests: Remove line macro from port_bif_SUITE Correct documentation, erl_bif_types and dialyzer tests Make port_info(Port,os_pid) work on Windows Extend erlang:port_info/1,2 to show the OS pid of a spawned process OTP-10057
2012-04-17tests: Remove line macro from port_bif_SUITEBjörn-Egil Dahlberg
2012-04-17Correct documentation, erl_bif_types and dialyzer testsPatrik Nyblom
2012-04-17Make port_info(Port,os_pid) work on WindowsBjörn-Egil Dahlberg
2012-04-17Extend 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-04-17Merge branch 'egil/r16/inet-remove-bit8/OTP-10056'Björn-Egil Dahlberg
* egil/r16/inet-remove-bit8/OTP-10056: Update preloaded prim_inet.beam erts: Remove bit8 option from prim_inet kernel, erts: Remove bit8 option from inet
2012-04-16Update preloaded prim_inet.beamBjörn-Egil Dahlberg
2012-04-16erts: Remove bit8 option from prim_inetBjörn-Egil Dahlberg
2012-04-16kernel, erts: Remove bit8 option from inetBjörn-Egil Dahlberg
2012-04-16Merge branch 'maint'Björn-Egil Dahlberg
2012-04-16Merge branch 'egil/inet-document-options/OTP-10053' into maintBjörn-Egil Dahlberg
* egil/inet-document-options/OTP-10053: kernel: Document ifaddr option kernel: Document tcp-, udp- and sctp_module option kernel: Remove bit8 option in spec kernel: Document bit8 option in inet:setopts/2 kernel: Initial doc of forgotten inet options
2012-04-16kernel: Document ifaddr optionBjörn-Egil Dahlberg
* same as ip option
2012-04-16kernel: Document tcp-, udp- and sctp_module optionBjörn-Egil Dahlberg
2012-04-16kernel: Remove bit8 option in specBjörn-Egil Dahlberg
* The option is removed to force warnings for dialyzer
2012-04-13Merge branch 'maint'Björn-Egil Dahlberg
2012-04-13Merge branch 'rr/wa-lcnt/OTP-10051' into maintBjörn-Egil Dahlberg
* rr/wa-lcnt/OTP-10051: lcnt: Let runq locks reflect actual call location lcnt: Enhancement fixups erts: Add lcnt port and suspend options Increase ethr event and lock counting constants to allow at least +A 1024.
2012-04-13kernel: Document bit8 option in inet:setopts/2Björn-Egil Dahlberg
* This is a highly specialized option which is probably not used and will be removed in R16
2012-04-13Merge branch 'maint'Gustav Simonsson
2012-04-13Merge branch 'maint-r15' into maintGustav Simonsson
2012-04-12Update .gitignoreBjörn-Egil Dahlberg
2012-04-12eldap: Update .gitignoreBjörn-Egil Dahlberg
2012-04-12kernel: Initial doc of forgotten inet optionsBjörn-Egil Dahlberg
* UDP: ulticast_if, multicast_loop and multicast_ttl, add_membership and drop_membership * Inet: bit8, buffer, deliver, high_watermark, linger and low_watermark
2012-04-11Merge branch 'maint-r14' into maint-r15Gustav Simonsson
2012-04-11Merge branch 'maint'Sverker Eriksson
2012-04-11Merge branch 'sverk/otp_build-no-commit-opt' into maintSverker Eriksson
* sverk/otp_build-no-commit-opt: Add --no-commit option to update_primary and update_preloaded
2012-04-11Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14Gustav Simonsson
2012-04-10lcnt: Let runq locks reflect actual call locationRick Reed
2012-04-10lcnt: Enhancement fixupsBjörn-Egil Dahlberg
2012-04-10Add --no-commit option to update_primary and update_preloadedSverker Eriksson
2012-04-05erts: Add lcnt port and suspend optionsRick Reed
* Add new suspend, location, and port_locks options to erts_debug:lock_counters. * Init and destroy lock counting for processes and ports as appropriate. Conflicts: erts/emulator/beam/erl_bif_info.c
2012-04-04Increase ethr event and lock counting constants to allow at least +A 1024.Rick Reed
2012-04-03Merge branch 'maint'Björn-Egil Dahlberg
2012-04-03Update version numbers for R15B02 devBjörn-Egil Dahlberg
2012-04-03Merge commit 'OTP_R15B01'Björn-Egil Dahlberg
2012-04-01Prepare releaseOTP_R15B01Erlang/OTP
2012-03-30Merge remote branch 'upstream/maint'Peter Andersson
2012-03-30Merge branch 'peppe/common_test/otp-10039' into maintPeter Andersson
* peppe/common_test/otp-10039: Document the new timetrap interface
2012-03-30Document the new timetrap interfacePeter Andersson
OTP-10039
2012-03-30Merge branch 'maint'Sverker Eriksson
2012-03-30Merge branch 'sverk/proc-race-leak/OTP-10041' into maintSverker Eriksson
* sverk/proc-race-leak/OTP-10041: erts: Fix memory leak caused by race on exiting process
2012-03-30Merge branch 'maint'Rickard Green
* maint: Fix wakeup functionality in no thread support case
2012-03-30Merge branch 'rickard/erts-poll/OTP-10019' into maintRickard Green
* rickard/erts-poll/OTP-10019: Fix wakeup functionality in no thread support case OTP-10036 is completely unrelated to this commit. Only here to trigger info about the OTP-10036 ticket in the release notes script... OTP-10036
2012-03-30erts: Fix memory leak caused by race on exiting processSverker Eriksson
Seen with valgrind running ets_SUITE:delete_large_tab or delete_large_named_table.
2012-03-30Update primary bootstrapBjörn-Egil Dahlberg
2012-03-30Merge branch 'maint'Björn-Egil Dahlberg