aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-12Merge branch 'maint'Zandra Hird
2015-03-12Merge branch 'shijiang1130/master' into maintZandra Hird
* shijiang1130/master: Add client example for using the SSH module OTP-12558
2015-03-12Merge branch 'maint'Henrik Nord
Conflicts: erts/emulator/hipe/hipe_bif0.c
2015-03-12Merge branch 'mikpe/hipe-mfait-rwlock' into maintHenrik Nord
* mikpe/hipe-mfait-rwlock: hipe: change mfa_info_table lock to rwmutex OTP-12557
2015-03-12Merge branch 'mikpe/avoid-oversize-bignums' into maintHenrik Nord
* mikpe/avoid-oversize-bignums: don't leave a heap hole in erts_bs_get_integer_2 don't create oversize bignums in binary matching OTP-12556
2015-03-12Merge branch 'egil/beam/select_val/OTP-12555'Björn-Egil Dahlberg
* egil/beam/select_val/OTP-12555: erts: Use linear search for small select_val arrays
2015-03-12Merge branch 'maint'Björn Gustavsson
* maint: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-12Merge branch 'egil/process_dictionary-initial-size/OTP-12535'Björn-Egil Dahlberg
* egil/process_dictionary-initial-size/OTP-12535: erts: Document option 'hpds' erts: Enable command line argument for initial pd size
2015-03-12Merge branch 'egil/revert-os_getenv-test_server'Björn-Egil Dahlberg
* egil/revert-os_getenv-test_server: Revert "Start using os:getenv/2 fun" in test_server
2015-03-12Merge branch 'bjorn/asn1/double-ellipses/OTP-12546' into maintBjörn Gustavsson
* bjorn/asn1/double-ellipses/OTP-12546: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-11Merge branch 'dgud/kernel/unicode_file_read/OTP-12144'Dan Gudmundsson
* dgud/kernel/unicode_file_read/OTP-12144: kernel: Add test for unicode mode in file kernel: Fix file:read_line/1 unicode error handling
2015-03-11Merge branch 'dgud/observer/misc-fixes'Dan Gudmundsson
* dgud/observer/misc-fixes: observer: Fix external monitors to registered processes in cdv observer: Cleanup io server parts observer: Fix range test
2015-03-11Merge branch 'dgud/observer/crashdump-run-queue/OTP/12401'Dan Gudmundsson
* dgud/observer/crashdump-run-queue/OTP/12401: observer: Add scheduler run queue to cdv
2015-03-11Merge branch 'maint'Dan Gudmundsson
* maint: mnesia: Flush late messages Add Debug info mnesia: better debug info when tests fail mnesia: Ensure tables are loaded before testing them
2015-03-11Merge branch 'dgud/testcasecuddle' into maintDan Gudmundsson
* dgud/testcasecuddle: mnesia: Flush late messages Add Debug info mnesia: better debug info when tests fail mnesia: Ensure tables are loaded before testing them
2015-03-11Merge branch 'hb/pr/357'Hans Bolinder
* hb/pr/357: Make the scanned form of the io_lib format strings available for processing
2015-03-11Merge branch 'hb/dialyzer/fix_from_form/OTP-12350'Hans Bolinder
* hb/dialyzer/fix_from_form/OTP-12350: [dialyzer] Correct handling of limited opaque types [dialyzer] Add testcases [dialyzer] Limit depth and size of types from forms [dialyzer] Fix the conversion of forms to types
2015-03-10kernel: Add test for unicode mode in fileDan Gudmundsson
2015-03-10kernel: Fix file:read_line/1 unicode error handlingDan Gudmundsson
When a file was opened with some unicode encoding, file:read_line/1 could return unicode codepoints > 255 in list mode and wrong error message in bin mode. Chose to break out 'get_line' functionality from get_chars/5 since 'get_until' handling is different (comes from io module which should return unicode lists) and seems to have its own (doc?) problems.
2015-03-10Merge branch 'maint'Zandra Hird
2015-03-10Merge branch 'josevalim/jv-binary-ets' into maintZandra Hird
* josevalim/jv-binary-ets: Support binary standard input in ets:i/1 OTP-12550
2015-03-10[dialyzer] Correct handling of limited opaque typesHans Bolinder
2015-03-10[dialyzer] Add testcasesHans Bolinder
The tests cannot be handled by earlier versions of Dialyzer.
2015-03-10[dialyzer] Limit depth and size of types from formsHans Bolinder
2015-03-10[dialyzer] Fix the conversion of forms to typesHans Bolinder
In particular fix handling of records.
2015-03-10Make the scanned form of the io_lib format strings available for processingRichard Carlsson
This adds three new functions to io_lib - scan_format/2, unscan_format/1, and build_text/1 - which expose the parsed form of the format control sequences to make it possible to easily modify or filter the input to io_lib:format/2. This can e.g. be used in order to replace unbounded-size control sequences like ~w or ~p with corresponding depth-limited ~W and ~P before doing the actual formatting.
2015-03-09Merge branch 'maint'Zandra Hird
2015-03-09Merge branch 'mururu/fix-type' into maintZandra Hird
* mururu/fix-type: Fix typos in the public_key doc OTP-12549
2015-03-09Merge branch 'ia/ssl/crl-cache/OTP-10362'Ingela Anderton Andin
* ia/ssl/crl-cache/OTP-10362: ssl: fix white box tests ssl: Integrate public_key CRL verification with the ssl application
2015-03-09Merge branch 'maint'Erland Schönbeck
Conflicts: erts/test/otp_SUITE.erl
2015-03-09Merge branch 'seriyps/zlib-inflate-bound'Henrik Nord
* seriyps/zlib-inflate-bound: Add zlib limited output buffer size functionality Conflicts: erts/preloaded/ebin/zlib.beam OTP-12548
2015-03-09Merge branch 'erland/ssh/time/OTP-12444' into maintErland Schönbeck
* erland/ssh/time/OTP-12444: Update misleading comment in ssh_basic_SUITE Update new time API and be back-compatible in ssh Use new time API and be back-compatible in ssh otp_SUITE: Ignore undefined functions in ssh
2015-03-09ssl: fix white box testsIngela Anderton Andin
2015-03-09ssl: Integrate public_key CRL verification with the ssl applicationIngela Anderton Andin
2015-03-09Merge branch 'maint'Ingela Anderton Andin
2015-03-09Merge branch 'ia/public_key/crl/OTP-12547' into maintIngela Anderton Andin
* ia/public_key/crl/OTP-12547: public_key: Improve CRL handling support
2015-03-09public_key: Improve CRL handling supportIngela Anderton Andin
2015-03-09Update primary bootstrapBjörn Gustavsson
2015-03-09Merge branch 'bjorn/compiler/maps'Björn Gustavsson
* bjorn/compiler/maps: v3_codegen: Teach the put_map_* instructions to reuse source registers beam_validator: Tighten tests of maps v3_core: Eliminate the sloppiness-encouraging get_ianno/1 function v3_core: Add is_map tests before map instructions beam_type: Use the complete register map when calculating liveness Introduce '%live' annotations with a complete register map beam_validator: Teach bif_type/3 and is_bif_safe/2 about is_map/1 v3_core: Simplify conversion of map patterns
2015-03-09v3_codegen: Teach the put_map_* instructions to reuse source registersBjörn Gustavsson
The put_map_assoc and put_map_exact instructions in the run-time system will support that the target register is the same as one of the source registers. Teach the code generator to take advantage of that. The disadvantages of not reusing register when possible is that the garbage collector may retain dead terms longer than necessary.
2015-03-09beam_validator: Tighten tests of mapsBjörn Gustavsson
2015-03-09v3_core: Eliminate the sloppiness-encouraging get_ianno/1 functionBjörn Gustavsson
get_ianno/1 would retrieve either a bare annotation or an annotation wrapped in an #a{} record. In both cases, it would return a wrapped annotation. We can replace the calls to get_ianno/1 with calls to get_anno/1, because the argument is always an #iclause{} and all iclause records are always initialized with a wrapped annotation.
2015-03-09v3_core: Add is_map tests before map instructionsBjörn Gustavsson
If we have a sequence of put_map_* instructions operating on the same map, it will be more efficient if we can have one is_map/2 instruction before put_map_* instructions, so that each put_map_* does not need to test whether the argument is a map.
2015-03-09beam_type: Use the complete register map when calculating livenessBjörn Gustavsson
When calculating the number of live registers for allocation instruction, it is not always safe to start with the number of live registers at the start of the block. We will need to use the register map to know whether there are any holes (dead registers) that are not subsequently filled. If the allocation instruction already has a number of live registers calculated, there is nothing to be gained by raising it.
2015-03-09Introduce '%live' annotations with a complete register mapBjörn Gustavsson
As a preparation for fixing a bug, introduce a complete register map in the '%live' annotations.
2015-03-09Merge branch 'ia/ssl/soft-upgrade-test-server-bug-workaround'Ingela Anderton Andin
* ia/ssl/soft-upgrade-test-server-bug-workaround: ssl: Workaround test server halfwordemulator bug
2015-03-06asn1ct_gen: Correct generation of .hrl files for multiple ellipsesBjörn Gustavsson
2015-03-06Fix BER code generationDan Gudmundsson
PKIX1Explicit-2009 did not compile. This commit was cherry-picked from 3ab3b07a already merged into master.
2015-03-06Add client example for using the SSH moduleLinus.yuan
2015-03-06Merge branch 'maint'Peter Andersson