aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-02-24Merge branch 'maint'Hans Bolinder
* maint: [erl_interface] Correct documentation
2016-02-24[erl_interface] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2016-02-24Merge branch 'maint'Hans Bolinder
* maint: Update preloaded module typos Conflicts: erts/preloaded/ebin/prim_file.beam
2016-02-24Update preloaded moduleHans Bolinder
2016-02-23Do not wait for main lock when looking up process not runningRickard Green
2016-02-23ssl: Modernize utility functionIngela Anderton Andin
Use application:ensure_all_started/2 instead of hard coding dependencies
2016-02-23typosSverker Eriksson
2016-02-23kernel: Add heart options testBjörn-Egil Dahlberg
2016-02-23kernel: Add heart options documentationBjörn-Egil Dahlberg
2016-02-23Merge branch 'maint'Hans Nilsson
Conflicts: lib/ssh/test/ssh_upgrade_SUITE.erl
2016-02-23Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-23kernel: Add builtin scheduler check for heartBjörn-Egil Dahlberg
In addition, the heart API is extended with the following functions: * heart:set_options/1 * heart:get_options/0 If heart:set_options([scheduler]) is set, heart will check scheduler responsiveness before every heartbeat to the heart port.
2016-02-23kernel: Add heart validation callback documentationBjörn-Egil Dahlberg
2016-02-23Merge branch 'dgud/observer/perf-freq'Dan Gudmundsson
* dgud/observer/perf-freq: observer: Optimize drawing of graphs observer: Make it possible to change the graphs Xaxis and update freq
2016-02-23Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2016-02-23Merge branch 'maint-18' into maintHenrik Nord
2016-02-23v3_core: Include line number annotations in binary patternsBjörn Gustavsson
We will need them when we start to produce warnings for patterns that can't match.
2016-02-23sys_core_fold: Introduce var_list/2Björn Gustavsson
As a preparation for checking binary patterns we will add var_list/2 that will work as pattern_list/2 but is guaranteed not to throw an exception. That way, we will only have to use try...catch for the few remaining calls to pattern_list/2.
2016-02-23sys_core_fold: Optimize clause/4Björn Gustavsson
Save work the *extremely* common case that the guard is a literal.
2016-02-23Use compile source info in debuggerJosé Valim
Prior to this commit, the debugger relied on a simple heuristic that traverses directory from the beam file to find a source file. The heuristic was maintained with this patch but, if it fails, it fallbacks to the source value in the module compile info. In order to illustrate how it works, one of the tests that could not find its source now passes successfully (showing the source lookup is more robust).
2016-02-22eldap: experimental impl of controls in LDAPMessageHans Nilsson
2016-02-22Merge branch 'maint'Rickard Green
* maint: Improve cmpxchg8b/cmpxchg16b inline asm Improve cmpxchg8b inline asm configure test
2016-02-22Merge branch 'rickard/dw-cmpxchg-clang/OTP-13336' into maintRickard Green
* rickard/dw-cmpxchg-clang/OTP-13336: Improve cmpxchg8b/cmpxchg16b inline asm
2016-02-22Merge branch 'rickard/gcc5-pic-cmpxchg8b/OTP-13326' into maintRickard Green
* rickard/gcc5-pic-cmpxchg8b/OTP-13326: Improve cmpxchg8b inline asm configure test
2016-02-22eldap: referral resultCodeHans Nilsson
2016-02-22Merge branch 'maint'Sverker Eriksson
2016-02-22Merge branch 'sverk/proc-lock-check-fix' into maintSverker Eriksson
* sverk/proc-lock-check-fix: erts: Fix lock checker for process locks
2016-02-22Merge branch 'maint'Hans Bolinder
* maint: Fix a few dialyzer warnings
2016-02-22Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder
* hb/add_dialyzer_suppressions/OTP-12862: Fix a few dialyzer warnings
2016-02-22Fix ssl exampleMagnus Henoch
As recently discussed on the erlang-questions mailing list, this example fails to start the ssl application because ssl depends on asn1 nowadays. Let's future-proof this by using application:ensure_all_started/1.
2016-02-22Fix a few dialyzer warningsHans Bolinder
2016-02-22ssh: catch port_close in testHans Nilsson
2016-02-22ssh: remove calls to crypto:start|stopHans Nilsson
Conflicts: lib/ssh/test/ssh_upgrade_SUITE.erl
2016-02-22ssh: add timetrap to all test suitesHans Nilsson
2016-02-22ssh: remove some spurions test printoutsHans Nilsson
2016-02-22Merge branch 'maint'Ingela Anderton Andin
2016-02-22Merge branch 'ia/ssl/connection_information/OTP-13232/OTP-13343' into maintIngela Anderton Andin
* ia/ssl/connection_information/OTP-13232/OTP-13343: ssl: Newer cipher suites now presented correctly ssl: Include options form connect/listen/accept in connection_information/[1,2]
2016-02-22ssl: Newer cipher suites now presented correctlyIngela Anderton Andin
Older SSL/TLS versions have cipher suites that look like {key_exchange(), cipher(), MAC::hash()} and the hash function used by the PRF (Pseudo Random function) is implicit and always the same for that protocol version. In TLS 1.2 a cipher suite is {key_exchange(), cipher(), MAC::hash(), PRF::hash()}. Internally a cipher suite is always a four tuple but for backwards compatibility older cipher suites will be presented as a three tuples, however new cipher suites should be presented as four tuples.
2016-02-22observer: Optimize drawing of graphsDan Gudmundsson
By allowing changes to the number of minutes displayed and update frequency, we need to optimize the drawing of the graphs as it can no longer recalculate everything in each frame drawn. Only recalculate the changed entries, takes more memory but far less cpu usage. While updating the gui, increase the frame-rate a bit so it updates smoother and decrease pen size for graphs to 1 pixel as it looks better according to an office voting.
2016-02-22observer: Make it possible to change the graphs Xaxis and update freqDan Gudmundsson
2016-02-22Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson
* upstream/maint: debugger: Editorial changes in documentation Observer: Editorial changes in documentation
2016-02-22Merge branch 'dgud/debugger/doc' into maintDan Gudmundsson
* dgud/debugger/doc: debugger: Editorial changes in documentation
2016-02-22debugger: Editorial changes in documentationxsipewe
2016-02-22Merge branch 'dgud/observer/doc' into maintDan Gudmundsson
* dgud/observer/doc: Observer: Editorial changes in documentation
2016-02-22Observer: Editorial changes in documentationtmanevik
2016-02-22ssl: Include options form connect/listen/accept in connection_information/[1,2]Ingela Anderton Andin
Make sure that options only relevant for one role (client|server) is set to undefined when the other role is invoked. As there are many options to ssl, and many are optional, we choose to filter out all undefined options to avoid overwhelming the user with not relevant information. This way there is no need for any special handling of the role specific options which is also nice.
2016-02-20beam_load.c: Add a function to check for an on_load functionBjörn Gustavsson
We will need a way to check whether an prepared BEAM modules has an on_load function.
2016-02-19eldap: unbindRequestHans Nilsson
2016-02-19Merge branch 'maint'Rickard Green
* maint: Fix bug causing run-queue mask to become inconsistent Conflicts: erts/emulator/beam/erl_process.h
2016-02-19Merge branch 'rickard/rq-state-bug/OTP-13298' into maintRickard Green
* rickard/rq-state-bug/OTP-13298: Fix bug causing run-queue mask to become inconsistent