aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-04-27Merge branch 'maint'Sverker Eriksson
Conflicts: erts/emulator/beam/erl_process.c
2012-04-27Merge branch 'maint-r15' into maintSverker Eriksson
Conflicts: erts/vsn.mk
2012-04-27Merge branch 'rickard/proc-sched/OTP-9892'Rickard Green
* rickard/proc-sched/OTP-9892: Teach etp-commands to understand new emulator internal data structures Optimize process state changes Optimize process table access Implement possibility to use ordinary mutexes as process locks Conflicts: erts/emulator/beam/erl_alloc.types
2012-04-27Teach etp-commands to understand new emulator internal data structuresRickard Green
2012-04-27Optimize process state changesRickard Green
2012-04-25Prepare releaseSverker Eriksson
2012-04-25Merge branch 'rickard/driver_system_info/OTP-10059' into maint-r15Erlang/OTP
* rickard/driver_system_info/OTP-10059: Clear number of async threads if no thread support
2012-04-25Merge branch 'rickard/no_ets_write_concurrency-r15b01/OTP-10048' into maint-r15Erlang/OTP
* rickard/no_ets_write_concurrency-r15b01/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
2012-04-25Merge branch 'rickard/sched-busy-wait/OTP-10044' into maint-r15Erlang/OTP
* rickard/sched-busy-wait/OTP-10044: Add switch controlling scheduler busy wait Conflicts: erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h
2012-04-25Merge branch 'rickard/sched-wakeup-other-r15b01/OTP-10033' into maint-r15Erlang/OTP
* rickard/sched-wakeup-other-r15b01/OTP-10033: Implement proposal for new scheduler wakeup strategy
2012-04-24Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Corrected ssh option handling
2012-04-24Merge branch 'ia/ssh/options-check-OTP-10061' into maintIngela Anderton Andin
* ia/ssh/options-check-OTP-10061: Corrected ssh option handling
2012-04-24Corrected ssh option handlingIngela Anderton Andin
The option ip_v6_disabled and the undocumented option exec was incorrectly handled by the option checking code. There where two options for allowing user interaction one documented and one undocumented, they where merge to to be the documented one. For backwards compatibility the undocumented one is transformed to the documented one in the option checking code.
2012-04-24Merge branch 'maint'Ingela Anderton Andin
* maint: Avoid sending two ssh close messages
2012-04-24Merge branch 'ia/ssh/close/OTP-10060' into maintIngela Anderton Andin
* ia/ssh/close/OTP-10060: Avoid sending two ssh close messages
2012-04-23Merge branch 'rickard/sched-wakeup-other/OTP-10033' into ↵Rickard Green
rickard/sched-wakeup-other-r15b01/OTP-10033 Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
2012-04-23Add switch controlling scheduler busy waitRickard Green
2012-04-23Implement proposal for new scheduler wakeup strategyRickard Green
2012-04-23Merge branch 'maint'Björn-Egil Dahlberg
2012-04-23Merge branch 'egil/fix-wa-lcnt-debug' into maintBjörn-Egil Dahlberg
* egil/fix-wa-lcnt-debug: erts: The lck->extra field needs 'TAGGED' data
2012-04-20Merge branch 'maint'Sverker Eriksson
2012-04-20Revert vsn.mk for crypto and private_keySverker Eriksson
Included them by "mistake".
2012-04-20Merge branch 'sverk/crypto-rsa-key-opt' into maintSverker Eriksson
* sverk/crypto-rsa-key-opt: public_key: Use optimized RSA private key handling crypto: Optimize RSA private key handling crypto: Remove unnecessary dependency to libssl OTP-10064 OTP-10065
2012-04-20public_key: Use optimized RSA private key handlingSverker Eriksson
by providing extra redundant information to crypto.
2012-04-20crypto: Optimize RSA private key handlingSverker Eriksson
by using extra redundant information as part of the key that will speed things up for OpenSSL. Affects rsa_sign, rsa_private_encrypt and rsa_private_decrypt.
2012-04-20erts: The lck->extra field needs 'TAGGED' dataBjörn-Egil Dahlberg
2012-04-20Avoid sending two ssh close messagesIngela Anderton Andin
2012-04-19Merge branch 'pan/dtrace_merge_master_correction'Patrik Nyblom
* pan/dtrace_merge_master_correction: Correct dtrace for master branch OTP-10017
2012-04-19Correct dtrace for master branchPatrik Nyblom
2012-04-18Clear number of async threads if no thread supportRickard Green
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-16Optimize process table accessRickard Green
2012-04-16Implement possibility to use ordinary mutexes as process locksRickard Green
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 02:30:28 +0000