aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-01-23Merge branch 'vinoski/emacs-fixes'Henrik Nord
* vinoski/emacs-fixes: fix emacs erlang skeleton indentation fix indentation error from scan-sexp in erlang.el prevent errors from erlang.el fix erlang-mode erlang-get-function-arity OTP-11601
2014-01-22Merge branch 'bjorn/erts/zlib-1.2.8'Björn Gustavsson
* bjorn/erts/zlib-1.2.8: configure: Prefer the system's zlib over own our zlib source Update preloaded modules Add the 'rle' zstrategy Don't make gzio.c dependent on the zutil.h header file Update zlib to 1.2.8 erts/zlib: Remove unused file example.c
2014-01-22Merge branch 'bjorn/asn1/optimizations/OTP-11573'Björn Gustavsson
* bjorn/asn1/optimizations/OTP-11573: Optimize code surrounding calls to complete/1 asn1ct_imm: Add the intermediate instruction {list,List,Dst} Generate intermediate code that is easier to optimize asn1ct_imm: Add the {set,{var,Src},{var,Dst}} instruction Keep type information in the apply intermediate instruction asn1ct_imm: Add a field for intermediate code for call_gen Introduce asn1ct_gen:open_output_file/1 Factor out printing of verbose messages Improve optimization of alignment for encoding Improve construction of {cons,H,T} instructions Teach asn1ct_func:call_gen/4 to quote the generated function name Test open types that may need more than 128 bytes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-skel-indent' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-sexp-error' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-fun-arity' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-error-fixes' into ↵Dan Gudmundsson
vinoski/emacs-fixes
2014-01-22Merge branch 'dgud/test_unicode/OTP-10877'Dan Gudmundsson
* dgud/test_unicode/OTP-10877: sasl test: Quote executable paths (can contain spaces) rt_tools: Handle unicode chars in printouts kernel: code_SUITE fix unicode option Fix (unicode) debug info in test cases stdlib: Fix format if module resides in a unicode directory Fix testing with unicode paths test_server: Fix ts write unicode in config files
2014-01-21Merge branch 'hans/ssh/unicode/OTP-10953'Hans Nilsson
2014-01-21ssh: prepare vsn.mk for releaseHans Nilsson
2014-01-21ssh: minor doc correction about unicodeHans Nilsson
2014-01-21Merge branch 'maint'Magnus Lidén
2014-01-21Merge branch 'nox/fix-OTP-11506' into maintMagnus Lidén
* nox/fix-OTP-11506: Smoke test erl_syntax:revert/1 Fix reverting of local implicit funs in erl_syntax
2014-01-21Smoke test erl_syntax:revert/1Anthony Ramine
This tries to make bugs like 87156887b7d82a2db53f60441a4af87034cb8789 not happen again. The new test takes each file in the stdlib app, passes their forms through the erl_syntax representation, reverts them and compiles them.
2014-01-21Fix reverting of local implicit funs in erl_syntaxAnthony Ramine
This partially reverts 290dc2b08a2f92157ac5358fba815f4dbb32f8f2 in which implicit funs were mistakenly thought to be using abstract terms for their name and arity.
2014-01-21Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-01-21Merge branch 'maint'Magnus Lidén
2014-01-21Merge branch 'lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551' into maintMagnus Lidén
* lars/xmerl/new-doc-in-same-buffer-bug/OTP-11551: [xmerl] Fix problem with header of next XML document is in the buffer when using xmerl_sax_parser:stream/2 function. [xmerl] Fix bug in SAX parser when next doc start in the same buffer
2014-01-21[xmerl] Fix problem with header of next XML document is in the bufferLars Thorsen
when using xmerl_sax_parser:stream/2 function.
2014-01-21[xmerl] Fix bug in SAX parser when next doc start in the same bufferLars Thorsen
2014-01-21ssh: Update documentationHans Nilsson
2014-01-21ssh: Adds uncode test suiteHans Nilsson
2014-01-21ssh: Adds unicodeHans Nilsson
2014-01-21Merge branch 'maint'Dan Gudmundsson
2014-01-21Merge branch 'dgud/wx/more-fixes/OTP-11444' into maintDan Gudmundsson
* dgud/wx/more-fixes/OTP-11444: wx: Fix hanging wx calls Update wx build instsructions for Darwin wx: Remove compiler option -fomit-frame-pointer on Darwin wx: Fix crash when garbage collect event handlers (debugger caused seg fault) wx: Fix LDFLAGS for Mac
2014-01-21Merge branch 'ia/ssl/openssl-reneogtiation-bug'Ingela Anderton Andin
* ia/ssl/openssl-reneogtiation-bug: ssl: Add versions to check for sane OpenSSL version for renegotiation
2014-01-21Merge branch 'maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/inets/httpd-manager-improvments/OTP-11557' into maintIngela Anderton Andin
* ia/inets/httpd-manager-improvments/OTP-11557: inets: Prepare for release inets: Remove log message as it causes more harm than use at the moment inets: Mend broken max_clients check inets: Start CT'ify httpd_SUITE inets: Remove use of default gen_server timeout
2014-01-21Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/odbc/configure/OTP-11574' into maintIngela Anderton Andin
* ia/odbc/configure/OTP-11574: odbc: Fix configure check to work proparly on windows
2014-01-21Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-01-21Merge branch 'ia/ssl/ECC-curve-selection/OTP-11575' into maintIngela Anderton Andin
* ia/ssl/ECC-curve-selection/OTP-11575: ssl: Prepare for release ssl: fix elliptic curve selection in server mode
2014-01-21Merge branch ↵Ingela Anderton Andin
'ia/ssl/server-name-indication-missing-option-validation/OTP-11567' into maint * ia/ssl/server-name-indication-missing-option-validation/OTP-11567: ssl: Prepare for release ssl: Add missing options validation of server_name_indication
2014-01-21Merge branch 'hawk/reltool_undefined_regexp'Henrik Nord
* hawk/reltool_undefined_regexp: Add missing default value for regexps in reltool It caused a function clause in lists:sort/1: OTP-11591 OTP-11592
2014-01-21Merge branch 'hawk/reltool_test_server'Henrik Nord
* hawk/reltool_test_server: Adapted reltool test server to common test usage of tc_status
2014-01-21Merge branch 'djc/tinfo-ncurses'Henrik Nord
* djc/tinfo-ncurses: Add support for the separate tinfo library from ncurses OTP-11590
2014-01-21Merge branch 'josevalim/jv-console-i'Henrik Nord
* josevalim/jv-console-i: Handle binary input in console helpers OTP-11589
2014-01-21sasl test: Quote executable paths (can contain spaces)Dan Gudmundsson
2014-01-21rt_tools: Handle unicode chars in printoutsDan Gudmundsson
2014-01-21kernel: code_SUITE fix unicode optionBjörn-Egil Dahlberg
2014-01-21Fix (unicode) debug info in test casesDan Gudmundsson
2014-01-21stdlib: Fix format if module resides in a unicode directoryDan Gudmundsson
2014-01-21Fix testing with unicode pathsDan Gudmundsson
re needs unicode option
2014-01-21test_server: Fix ts write unicode in config filesDan Gudmundsson
2014-01-20Merge branch 'sverk/term2bin-simplify'Sverker Eriksson
* sverk/term2bin-simplify: erts: Refactor ESTACK & WSTACK to use a struct easy to "export" erts: Fix benign ESTACK/WSTACK typo erts: Fix compiler warnings for NO_JUMP_TABLE erts: Run binary_SUITE:trapping even for 32bit erts: Extend binary_SUITE:ttb_trap to also cover binary_to_term erts: Remove the extra_root feature from the process structure erts: Simplify term_to_binary by removing saved ESTACK from root set
2014-01-20Merge branch 'rickard/consume_timeslice-testcase-fix'Rickard Green
* rickard/consume_timeslice-testcase-fix: Fix testcase driver_SUITE:consume_timeslice
2014-01-20Fix testcase driver_SUITE:consume_timesliceRickard Green
2014-01-20Merge branch 'sverk/jinterface/unicode-test-bug'Sverker Eriksson
* sverk/jinterface/unicode-test-bug: jinterface: Fix unicode bug in test code
2014-01-20Merge branch 'sverk/bin2term-int-size-estimation-bug'Sverker Eriksson
OTP-11585 * sverk/bin2term-int-size-estimation-bug: erts: Fix useless comparisons in binary_SUITE:external_size erts: Reduce heap usage for binary_SUITE:deep erts: Remove overestimation of heap space in binary_to_term
2014-01-20Optimize code surrounding calls to complete/1Björn Gustavsson
complete/1 is used when encoding open types (as well as in the encode/2 function in a generated module). The use of complete/1 for encoding open types used to be optimized in two different places. One place was in the alignment optimization pass, where we attempted to replace the call to complete/1 with a call to iolist_to_binary/1. That optimization was taken out in a previous commit that introduced the {list,_,_} intermediate instruction. The other place was when creating the intermediate representation for the encoding of the open type. When attempting to wrap primitive types in an open type, we would attempt to optimize the encoding of the length decscriptor. We will remove that optimization in this commit. Since the previous two optimizations did not optimize encoding of open types as much as we would want, we will introduce a new optimization in a separate pass that will go further than the previous optimizations.