aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-03-05Merge branch 'maint'Siri Hansen
2012-03-05Merge branch 'siri/stdlib/hanging-restart-loop/OTP-9549' into maintSiri Hansen
* siri/stdlib/hanging-restart-loop/OTP-9549: Leave control back to gen_server during supervisor's restart loop
2012-03-05Leave control back to gen_server during supervisor's restart loopSiri Hansen
When an attempt to restart a child failed, supervisor would earlier keep the execution flow and try to restart the child over and over again until it either succeeded or the restart frequency limit was reached. If none of these happened, supervisor would hang forever in this loop. This commit adds a timer of 0 ms where the control is left back to the gen_server which implements the supervisor. This way any incoming request to the supervisor will be handled - which could help breaking the infinite loop - e.g. shutdown request for the supervisor or for the problematic child. This introduces some incompatibilities in stdlib due to new return values from supervisor: * restart_child/2 can now return {error,restarting} * delete_child/2 can now return {error,restarting} * which_children/1 returns a list of {Id,Child,Type,Mods}, where Child, in addition to the old pid() or 'undefined', now also can be 'restarting'.
2012-03-05Merge branch 'maint'Sverker Eriksson
2012-03-05Merge branch 'sverk/etp-ets-tabledump' into maintSverker Eriksson
* sverk/etp-ets-tabledump: erts: Fix gdb command etp-ets-tabledump
2012-03-05erts: Fix gdb command etp-ets-tabledumpSverker Eriksson
2012-03-01Merge branch 'maint'Gustav Simonsson
2012-03-01Merge branch 'mh/create_cookie_error_msg' into maintGustav Simonsson
* mh/create_cookie_error_msg: Specify file name and error on create_cookie failure OTP-9954
2012-02-29Merge branch 'maint'Rickard Green
* maint: Fix implementation with ddrb barriers
2012-02-29Merge branch 'rickard/barriers/OTP-9922' into maintRickard Green
* rickard/barriers/OTP-9922: Fix implementation with ddrb barriers
2012-02-29Merge branch 'maint'Adam Lindberg
2012-02-29Merge branch 'alind/asn1/parallel-tests' into maintAdam Lindberg
* alind/asn1/parallel-tests: [asn1] Refactor test cases and remove extra suites [asn1] Replace 'driver' option with 'nif' [asn1] Correct test suite dependencies [asn1] Parallelize test suites [asn1] Make tables and processes unnamed [asn1] Abstract out table access to new module [asn1] Run asn1 compilation in a separate process
2012-02-29[asn1] Refactor test cases and remove extra suitesAdam Lindberg
2012-02-28Merge branch 'maint'Patrik Nyblom
2012-02-28Update primary bootstrap hipe_unified_loaderPatrik Nyblom
2012-02-28Merge branch 'pan/hipe_hipe_compiled/OTP-9082' into maintPatrik Nyblom
* pan/hipe_hipe_compiled/OTP-9082: Make hipe hipe-compiled w/ --enable-native-libs
2012-02-28Make hipe hipe-compiled w/ --enable-native-libsPatrik Nyblom
2012-02-28[asn1] Replace 'driver' option with 'nif'Adam Lindberg
2012-02-28[asn1] Correct test suite dependenciesAdam Lindberg
2012-02-28[asn1] Parallelize test suitesAdam Lindberg
2012-02-28[asn1] Make tables and processes unnamedAdam Lindberg
- Refactor and clean up asn1_db process - Remove unused stop function in asn1ct.erl - Remove infinite loop possibilites in asn1ct_check.erl - test/1,2,3 now run in separate process - Update documentation for new test options
2012-02-28[asn1] Abstract out table access to new moduleAdam Lindberg
All table access is now performed in a separate module. This will allow changes to how ETS is handled by changing only this module. Note that the module exports a very ETS-like interface for now which would have to be maintained even if the data format would change (to a hash map for example).
2012-02-28[asn1] Run asn1 compilation in a separate processAdam Lindberg
2012-02-28Merge branch 'maint'Dan Gudmundsson
2012-02-28Merge branch 'dgud/observer/perf-mon/OTP-9891' into maintDan Gudmundsson
2012-02-28Merge branch 'dgud/mnesia/fix-qlc-warning' into maintDan Gudmundsson
* dgud/mnesia/fix-qlc-warning: [mnesia] Fix warning in example code
2012-02-28Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maintDan Gudmundsson
* dgud/wx/misc-improvements/OTP-9947: [wx] Add simple taskbaricon test [wx] Add missing stc function [wx] Add wxTaskBarIcon class [wx] Doc overloaded functions [wx] Fix spec errors [wx] Fix api bugs in wxDC [wx] Fix wxGraphicContext bugs [wx] Remove redundant erts version check [wx] Generated types for all wx classes [wx] Generate GL api from latest version [wx] Cleanup Makefiles
2012-02-28Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Document currently supported algorithms
2012-02-28Merge branch 'ia/ssh/currently-supported-doc/OTP-8109' into maintIngela Anderton Andin
* ia/ssh/currently-supported-doc/OTP-8109: Document currently supported algorithms
2012-02-28Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Prevent client hanging. (OTP-8111) Added checks of API input Improve check so that we will not try to read ssh packet length indicator if not sure we have enough data. Improved error handling
2012-02-28Merge branch 'ia/ssh/error-handling' into maintIngela Anderton Andin
* ia/ssh/error-handling: Prevent client hanging. (OTP-8111) Added checks of API input Improve check so that we will not try to read ssh packet length indicator if not sure we have enough data. Improved error handling
2012-02-28Prevent client hanging. (OTP-8111)Ingela Anderton Andin
Restored supervisor tree so that error propagation will work as intended, although connection processes are set to temporary, instead of permanent with restart times set to 0, and termination of the connection subtree is initiated by a temporary process spawned by ssh_connection_managers terminate. This is done to avoid unwanted supervisor reports. Pherhaps we need some new supervisor functionality.
2012-02-27[wx] Add simple taskbaricon testDan Gudmundsson
2012-02-24Merge branch 'maint'Gustav Simonsson
2012-02-24Merge branch 'uw/extending_gen' into maintGustav Simonsson
* uw/extending_gen: Add plugin support for alternative name lookup OTP-9945
2012-02-24Merge branch 'pan/win32_testbuild' into maintGustav Simonsson
* pan/win32_testbuild: Set PATH correctly when building tests on win32
2012-02-24[wx] Add missing stc functionDan Gudmundsson
wxSTC:SetEdgeMode was missing for some reason.
2012-02-24[wx] Add wxTaskBarIcon classDan Gudmundsson
2012-02-24[wx] Doc overloaded functionsDan Gudmundsson
edoc do not handle overloaded type-specs, so doc them manually
2012-02-23Merge branch 'sverk/hipe-debug-cherries'Sverker Eriksson
* sverk/hipe-debug-cherries: hipe,erts: Add DEBUG support with MFA's in stack descriptors hipe: Fix address_to_mfa in hipe loader hipe,erts: Debug support for native call trace erts: Make erts_printf accept internal match states
2012-02-23Merge branch 'maint'Sverker Eriksson
2012-02-23Merge branch 'sverk/ets-compress-bug' into maintSverker Eriksson
* sverk/ets-compress-bug: erts: Fail binary_to_term if bignum arity is too large erts: Fix bignum-bug in ETS with compressed option OTP-9932
2012-02-23Merge branch 'maint'Gustav Simonsson
2012-02-22Merge branch 'tst/no_hipe_ceach' into maintGustav Simonsson
* tst/no_hipe_ceach: Remove hipe_ceach from hipe.app.src to fix reltool-generated release startup OTP-9939
2012-02-22Merge branch 'maint'Gustav Simonsson
2012-02-22* jv/on_load_docs:Gustav Simonsson
Fix a typo on documentation. desciption -> description. OTP-9937
2012-02-22Merge branch 'jv/on_load_docs' into maintGustav Simonsson
2012-02-22[wx] Fix spec errorsDan Gudmundsson
2012-02-21Fix implementation with ddrb barriersRickard Green
2012-02-21Merge branch 'rj/add-space-spec_proc-doc' into maintGustav Simonsson