aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-10-09Improve binary matching of literalsBjörn Gustavsson
The bs_match_string instruction is used to speed up matching of binary literals. For example, given this source code: foo1(<<1,2,3>>) -> ok. The matching part of the code will look like: {test,bs_start_match2,{f,1},1,[{x,0},0],{x,0}}. {test,bs_match_string,{f,3},[{x,0},24,{string,[1,2,3]}]}. {test,bs_test_tail2,{f,3},[{x,0},0]}. Nice. However, if we do a simple change to the source code: foo2(<<1,2,3>>) -> ok; foo2(<<>>) -> error. the resulting matching code will look like (sligthly simplified): {test,bs_start_match2,{f,4},1,[{x,0},0],{x,0}}. {test,bs_get_integer2,{f,7},1,[{x,0},{integer,8},1,Flags],{x,1}}. {test,is_eq_exact,{f,8},[{x,1},{integer,1}]}. {test,bs_match_string,{f,6},[{x,0},16,{string,[2,3]}]}. {test,bs_test_tail2,{f,6},[{x,0},0]}. {move,{atom,ok},{x,0}}. return. {label,6}. {bs_restore2,{x,0},{atom,start}}. {label,7}. {test,bs_test_tail2,{f,8},[{x,0},0]}. That is, matching of the first byte is not combined into the bs_match_string instruction that follows. Fix this problem by allowing a bs_match_string instruction to be used if all clauses will match either the same integer literal or the empty binary.
2012-10-09v3_codegen: Combine adjacent bs_match_string instructionsBjörn Gustavsson
In modules with huge functions with many bs_match_string instructions, we can speed up the compilation by combining adjacent bs_match_strings instruction in v3_codegen (as opposed to in beam_block where we used to do it). For instance, on my computer the v3_codegen became more than twice as fast when compiling the re_testoutput1_split_test module in the STDLIB test suites.
2012-10-09beam_bool: Recognize more safe optimizationsBjörn Gustavsson
The optimizer of boolean expressions can often reject optimizations that it does not recognize as safe. For instance, if a boolean expression was preceded by 'move' instructions that saved x registers into y registers, it would almost certainly reject the optimization because it required the y register not be used in the code that follows. Fix this problem by allowing identical 'move' instructions that assing to y registers at the beginning of the old and the optimized code. While at it, correct the spelling of "preceding".
2012-10-09beam_utils: Correct usage calculations for GC BIFs in blocksBjörn Gustavsson
The usage calculation only looked at the allocation in GC BIFs, not at the source and destination registers. Also, if there is a failure label, make sure that we test whether the register can be used there.
2012-10-09beam_utils:live_opt/1: Correct liveness calculation for 'try'Björn Gustavsson
The liveness at the failure label should be ignored, because if there is an exception, all x registers will be killed.
2012-10-09beam_utils: Extend live_opt/1 to recalculate live registers in allocsBjörn Gustavsson
The code generator uses conservative liveness information. Therefore the number of live registers in allocation instructions (such as test_heap/2) may be too high. Use the actual liveness information to lower the number of live register if it's too high. The main reason we want to do this is to enable more optimizations that depend on liveness analysis, such as the beam_bool and beam_dead passes.
2012-10-09beam_utils: Check liveness in catches and try/catch blocksBjörn Gustavsson
Less conservative liveness analysis allows more optimizations to be applied (such as the ones in beam_bool).
2012-10-09v3_codegen: Clarify code generation for binary constructionBjörn Gustavsson
Add some comments to make the code generation for binary construction somewhat clearer. Also get rid of the cg_bo_newregs/2 function that serves no useful purpose. (It was probably intended to undo the effect of cg_live/2, but note that the value passed to cg_bo_newregs/2 has not passed through cg_live/2.)
2012-10-09v3_codegen: Clean up comments and remove out-commented codeBjörn Gustavsson
2012-10-09v3_codegen: Don't duplicate the functionality of cg_reg_arg/2Björn Gustavsson
2012-10-08Merge branch 'sze/improve-interoperability-SSH-clients'Henrik Nord
* sze/improve-interoperability-SSH-clients: Improve interoperability with SSH clients OTP-10475
2012-10-08Merge branch 'jn/ets-match-pattern-export-type'Henrik Nord
* jn/ets-match-pattern-export-type: Export ets:match_pattern/0 type Conflicts: lib/stdlib/src/ets.erl OTP-10472
2012-10-08Merge branch 'hb/stdlib/opaque_warnings/OTP-10436'Hans Bolinder
* hb/stdlib/opaque_warnings/OTP-10436: Fix Dialyzer warnings
2012-10-05Merge branch 'sverk/code-load-refactor-later-op'Sverker Eriksson
* sverk/code-load-refactor-later-op: erts: Fix faulty lock check assert erts: Refactor naming regarding code_write_permission erts: Refactor tracing to use erts_schedule_thr_prgr_later_op erts: Allow thr_prgr_later_op to reschedule erts: Refactor code loading to use erts_schedule_thr_prgr_later_op erts: Remove some compiler warnings
2012-10-05Merge branch 'ia/ssl/controlling-process-on-listen-socket/OTP-10447'Ingela Anderton Andin
* ia/ssl/controlling-process-on-listen-socket/OTP-10447: ssl: Improve #sslsocket{} API ssl: It is now possible to call controlling_process on a listen socket, same as in gen_tcp.
2012-10-05Improve interoperability with SSH clientsStefan Zegenhagen
This patch fixes a few problems of the SSH shell server that affect the interoperability with SSH clients in widespread use. First problem is that, whenever a channel_request message is received with want_reply=true, the reply ends up being sent to the servers channel id, not the clients channel id. This causes the client to terminate the connection. The easiest solution to the problem appears to be a new function in ssh_connection_manager.erl that translates the servers channel id before sending the reply (in the same manner as other functions do it). Second problem is in ssh_cli.erl. When an SSH client sends a window_change request between PTY allocation and starting the shell (which appears to happen with some clients), ssh_cli.erl crashes because #state.buf is yet 'undefined'. Allocating an empty buffer at PTY allocation time solves the problem. Affected SSH clients: - all clients based on SSH-2.0-TrileadSSH2Java_213 (problem #1) - SSH Term Pro (problem #2)
2012-10-05ts_run: Always turn on timetrap scaling when starting common_testBjörn Gustavsson
Scaling timetraps depending on cover, debug-compiled emulator and so on is built-in to the test_server. Therefore, {multiply_timetraps,Scale} should not be set (it would multiply the timeout value twice). Only {scale_timetraps,true} needs to be set, and it must be set unconditionally as the feature tests in test_server:timetrap_scale_factor() may not return the correct scale factor until the test_server node and test cases have been started (for example, there is no cover server running).
2012-10-05Fix Dialyzer warningsHans Bolinder
Opaque types need to be exported.
2012-10-04Merge branch 'ia/ssh/sending-large-data-and-eof/OTP-10467'Ingela Anderton Andin
* ia/ssh/sending-large-data-and-eof/OTP-10467: ssh: Make test case platform independant ssh: ssh_connection:channel_data() and send_eof() now return {error, closed} for closed or invalid channels. ssh: Ensure that all data is sent before ssh:send returns. ssh: add test suite for testing channel send/receive behavior.
2012-10-04Merge branch 'ia/ssl/sslv2-test'Ingela Anderton Andin
* ia/ssl/sslv2-test: ssl: Better test to determine if sslv2 is supported by openssl
2012-10-03ssh: Make test case platform independantIngela Anderton Andin
The test case interrupted_send did not work on all platforms. Also ct-ify the test suite
2012-10-03ssh: ssh_connection:channel_data() and send_eof() now return {error, closed} ↵Daniel Goertzen
for closed or invalid channels. ssh_connection:handle_msg(#ssh_msg_channel_close...) will now cause any send() that was in progress to immediately return {error,closed}.
2012-10-03ssh: Ensure that all data is sent before ssh:send returns.Daniel Goertzen
2012-10-03ssh: add test suite for testing channel send/receive behavior.Daniel Goertzen
2012-10-03Merge branch 'gp/make_erlang_mode_elpa_friendly'Henrik Nord
* gp/make_erlang_mode_elpa_friendly: Make erlang-mode more compatible with package.el OTP-10465
2012-10-03Merge branch 'maint'Henrik Nord
2012-10-03Merge branch 'sa/dialyzer-fix-r15b02' into maintHenrik Nord
* sa/dialyzer-fix-r15b02: Fix a crash in race condition detection Remove old untested experimental extension Respect {plt_check,false} option when using dialyzer:run/1 Fix handling of tuple set remote types appearing in tuple sets OTP-10464
2012-10-03Merge branch 'bjorn/test_server/fix-test-cases'Björn Gustavsson
* bjorn/test_server/fix-test-cases: Provided better information when the test cases fail Remove the useless test_server_line_SUITE test suite test_server_SUITE: Remove the undefined_functions/1 test case
2012-10-02Merge branch 'egil/fix-doc-vxworks'Björn-Egil Dahlberg
* egil/fix-doc-vxworks: doc: Remove forgotten vxworks reference
2012-10-02Merge branch 'raimo/inets/https-proxy/OTP-10256'Raimo Niskanen
* raimo/inets/https-proxy/OTP-10256: inets httpc: Document that RFC 2817 is not supported inets: Dialyzer fixes inets httpc: TLS via proxy inets: Remove obsolete testcases that are now in the proxy suite inets: Add tests using external proxy running on localhost
2012-10-02inets httpc: Document that RFC 2817 is not supportedIngela Anderton Andin
2012-10-02inets: Dialyzer fixesIngela Anderton Andin
2012-10-02inets httpc: TLS via proxyIngela Anderton Andin
Introduces new option htts_proxy so that it is possible to have different proxies for http and https. The new option defaults to the old proxy option. Implements HTTP-1.1 extension method CONNECT to establish SSL/TLS tunnel We choose not to implement "TLS upgrade" as defined by RFC 2817 as this method of upgrade is vulnerable to man in the middle attacks, can be easily broken by proxies and does not seem to be widely adopted.
2012-10-02inets: Remove obsolete testcases that are now in the proxy suiteRaimo Niskanen
2012-10-02inets: Add tests using external proxy running on localhostRaimo Niskanen
2012-10-01doc: Remove forgotten vxworks referenceBjörn-Egil Dahlberg
2012-10-01ssl: Better test to determine if sslv2 is supported by opensslIngela Anderton Andin
2012-10-01ssl: Improve #sslsocket{} APIIngela Anderton Andin
A #sslsocket{} contains the fsm pid and value that was previously set to old_ssl or new_ssl to make the transition period smoother. Now that old ssl is not supported any more we use this field to store the inet socket reference instead. This enables some API functions to return quicker as they do not need to communicate with the fsm-process.
2012-10-01ssl: It is now possible to call controlling_process on a listen socket,Ingela Anderton Andin
same as in gen_tcp. Made error handling of listen sockets as arguments to funtions expecting a connected socket more inet/gen_tcp like.
2012-10-01Merge branch 'dg/keyboard_interactive'Henrik Nord
* dg/keyboard_interactive: fix typo in keyboard-interactive string OTP-10456
2012-10-01Provided better information when the test cases failBjörn Gustavsson
While at it, also make the path to the directory with the log files a clickable link.
2012-10-01Merge branch 'siri/common_test/ct_snmp-tests'Siri Hansen
* siri/common_test/ct_snmp-tests: [common_test] Added tests and corrected bugs in ct_snmp OTP-10454 OTP-10434
2012-10-01Merge branch 'siri/os_mon/undefined-snmp-funcs/OTP-10448'Siri Hansen
* siri/os_mon/undefined-snmp-funcs/OTP-10448: [os_mon] Remove call to deprecated/undefined functions in snmp
2012-10-01Merge branch 'vs/re_back_reference'Henrik Nord
* vs/re_back_reference: extend re back reference syntax with \g escape sequence OTP-10455
2012-10-01Merge branch 'bjorn/erts/crash-dump-fix'Björn Gustavsson
* bjorn/erts/crash-dump-fix: Fix missing information in crash dump for native-compiled modules
2012-10-01Merge branch 'bjorn/test_server/dialyzer-fixes'Björn Gustavsson
* bjorn/test_server/dialyzer-fixes: test_server_ctrl: Don't use undocumented features of io:format() Fix obsolete assumption for the return type of os:type/0
2012-09-28[common_test] Added tests and corrected bugs in ct_snmpSiri Hansen
OTP-10454 OTP-10434 Function register_users/2, register_agents/2 and register_usm_users/2, and the corresponding unregister_*/1 functions were not executable. These are corrected/rewritten. Function update_usm_users/2 is removed, and an unregister function is added instead. Update can now be done with unregister_usm_users and then register_usm_users. Functions unregister_*/2 are added, so specific users/agents/usm users can be unregistered. Function unload_mibs/1 is added. Overriding configuration files did not work, since the files were written in priv_dir instead of in the configuration dir (priv_dir/conf). This has been corrected. Minor updates to documentation.
2012-09-28Merge branch 'hb/stdlib/opaque_warnings/OTP-10436'Hans Bolinder
* hb/stdlib/opaque_warnings/OTP-10436: Refine a few opaque types Warn for underspecified opaque types Warn for opaque types that are not exported
2012-09-27Merge branch 'hb/dialyzer/nowarn_unused_fun/OTP-10433'Hans Bolinder
* hb/dialyzer/nowarn_unused_fun/OTP-10433: dialyzer: Do not output warnings for unused funs
2012-09-27Merge branch 'dgud/ct/fix-trashed-logs/OTP-10369'Dan Gudmundsson
* dgud/ct/fix-trashed-logs/OTP-10369: [ct] Shorten testcase names Shorten testcase names [ct] Block output into single io call