aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-10-28Merge branch 'maint'Lukas Larsson
* maint: erts: Initialize links when reading file info
2014-10-28Merge branch 'lukas/erts/win32-read_file_info-links/OTP-12269' into maintLukas Larsson
* lukas/erts/win32-read_file_info-links/OTP-12269: erts: Initialize links when reading file info
2014-10-28Merge branch 'maint'Lukas Larsson
* maint: Use isfinite() instead of finite() when available
2014-10-28Merge branch 'sv/isfinite/OTP-12268' into maintLukas Larsson
* sv/isfinite/OTP-12268: Use isfinite() instead of finite() when available
2014-10-28Use isfinite() instead of finite() when availableAnthony Ramine
OS X Mavericks builds result in a number of warnings about finite() being deprecated, like these: beam/erl_arith.c:451:7: warning: 'finite' is deprecated: first deprecated in OS X 10.9 [-Wdeprecated-declarations] ERTS_FP_ERROR(p, f1.fd, goto badarith); ^ sys/unix/erl_unix_sys.h:319:33: note: expanded from macro 'ERTS_FP_ERROR' ^ sys/unix/erl_unix_sys.h:244:51: note: expanded from macro '__ERTS_FP_ERROR' ^ /usr/include/math.h:718:12: note: 'finite' has been explicitly marked deprecated here extern int finite(double) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_9, __IPHONE_NA, __IPHONE_NA); Add checks to use isfinite() instead of finite() where available. Verified on OS X Mavericks 10.9.5 and Ubuntu 12.04.
2014-10-28Merge branch 'maint'Bruce Yinhe
2014-10-28Merge branch 'pguyot/fix-freebsd-cpu-topology' into maintBruce Yinhe
OTP-12267 * pguyot/fix-freebsd-cpu-topology: Fix bug in FreeBSD topology detection code
2014-10-28Merge branch 'maint'Bruce Yinhe
2014-10-28Merge branch 'vinoski/erl-nif-init' into maintBruce Yinhe
OTP-12266 * vinoski/erl-nif-init: Fix missing field initializer in ERL_NIF_INIT macro
2014-10-27Merge branch 'egil/fix-instruction-counter'Björn-Egil Dahlberg
* egil/fix-instruction-counter: erts: Fix SMP for ERTS_OPCODE_COUNTER_SUPPORT erts: Add icount build type for opcode counter
2014-10-27Merge branch 'maint'Björn-Egil Dahlberg
2014-10-27Merge branch 'egil/maps/syntax-tools/OTP-12265' into maintBjörn-Egil Dahlberg
* egil/maps/syntax-tools/OTP-12265: syntax_tools: Strengthen igor tests syntax_tools: Strengthen erl_recomment tests syntax_tools: Strengthen erl_syntax comments tests syntax_tools: Teach Maps to erl_syntax syntax_tools: Fix is_literal/1 for binary syntax_tools: Strengthen epp_dodger tests syntax_tools: Strengthen erl_syntax tests syntax_tools: Refactor away ?line macro
2014-10-27Merge branch 'maint'Marcus Arendt
2014-10-27Merge branch 'knewter/bugfix/typo_in_wx_demo' into maintMarcus Arendt
* knewter/bugfix/typo_in_wx_demo: wx: Fix typo in graphicsContext example
2014-10-27Merge branch 'scrapinghub/update_session_original_stacktrace'Marcus Arendt
* scrapinghub/update_session_original_stacktrace: inets: Return correct stacktrace on session updating failure
2014-10-27Merge branch 'maint'Marcus Arendt
2014-10-27Merge branch 'vinoski/darwin-vsn-odbc' into maintMarcus Arendt
* vinoski/darwin-vsn-odbc: Make ODBC configure handle OS X Mavericks and Yosemite
2014-10-24syntax_tools: Strengthen igor testsBjörn-Egil Dahlberg
Simple test of igor:merge/3
2014-10-24syntax_tools: Strengthen erl_recomment testsBjörn-Egil Dahlberg
Also erl_comment_scan tests.
2014-10-24syntax_tools: Strengthen erl_syntax comments testsBjörn-Egil Dahlberg
Comments in the syntax tree. Tested via t_epp_dodger.
2014-10-24Merge branch 'sverk/hipe-inline-reserve-trap-frame'Sverker Eriksson
* sverk/hipe-inline-reserve-trap-frame: erts: Extend usage of ASM macro to avoid including asm macros in C code erts: Make hipe_{un}reserve_beam_trap_frame INLINE
2014-10-24erts: Extend usage of ASM macro to avoid including asm macros in C codeSverker Eriksson
and reduce the probability of macro name collisions Catalyst: ppc macro "r0" conflicting with local variable in external.c
2014-10-24erts: Make hipe_{un}reserve_beam_trap_frame INLINESverker Eriksson
2014-10-24syntax_tools: Teach Maps to erl_syntaxBjörn-Egil Dahlberg
Affected functions: * erl_syntax:abstract/1 * erl_syntax:concrete/1 * erl_syntax:is_leaf/1 * erl_syntax:is_literal/1
2014-10-24syntax_tools: Fix is_literal/1 for binaryBjörn-Egil Dahlberg
2014-10-24Merge branch 'maint'Sverker Eriksson
2014-10-24Merge branch 'sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231' into maintSverker Eriksson
* sverk/hipe-wrap-bif-disable-gc-fixes/OTP-12231: erts: Fix bug when hipe tailcalls trapping BIF that disables GC erts: Fix hipe bug when gc-disabling bif traps with gc enabled
2014-10-24Merge branch 'siri/test-upgrade'Siri Hansen
* siri/test-upgrade: Add upgrade test in stdlib_SUITE [ct] Add ct_release_tests.erl Specify tar-file as basename in upgrade_SUITE
2014-10-23syntax_tools: Strengthen epp_dodger testsBjörn-Egil Dahlberg
Mostly epp_dodger smoke tests.
2014-10-23syntax_tools: Strengthen erl_syntax testsBjörn-Egil Dahlberg
Mostly type and conversion tests.
2014-10-23Merge branch 'maint'Henrik Nord
2014-10-23Merge branch 'maint-17' into maintHenrik Nord
Conflicts: OTP_VERSION
2014-10-23Updated OTP versionOTP-17.3.3Erlang/OTP
2014-10-23Update release notesErlang/OTP
2014-10-23Merge branch 'hans/ssh/scanning/OTP-12247' into maint-17Erlang/OTP
* hans/ssh/scanning/OTP-12247: ssh: fix ssh.appup.src. ssh: Corrected appup ssh: fix .app and .appup errors ssh: remove supervisors for crashed connection worker ssh: Print supervisor tree (on demand). ssh: prepare for release ssh: avoid terminated but not deleted children to be counted. ssh: simple info function (ssh_info:print/0). ssh: Gracefully handle bad handshake messages ssh: reduce amount of printouts ssh: Fix port scanner problems
2014-10-23Merge branch 'maint'Rickard Green
* maint:
2014-10-23Merge branch 'rickard/default-eager-check-io/OTP-12254'Rickard Green
* rickard/default-eager-check-io/OTP-12254: Change default to "eager check I/O"
2014-10-23Merge branch 'rickard/master/eager-check-io/OTP-12117'Rickard Green
* rickard/master/eager-check-io/OTP-12117: No eager check I/O on OSE Introduce support for eager check I/O scheduling
2014-10-23Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into maintRickard Green
* rickard/maint-17/eager-check-io/OTP-12117: No eager check I/O on OSE Introduce support for eager check I/O scheduling
2014-10-23ssh: fix ssh.appup.src.Hans Nilsson
2014-10-23ssh: Corrected appupIngela Anderton Andin
2014-10-23Merge branch 'maint'Hans Bolinder
* maint: Fix rare race condition in Dets
2014-10-23Merge branch 'hb/stdlib/fix_dets_test' into maintHans Bolinder
* hb/stdlib/fix_dets_test: Fix rare race condition in Dets
2014-10-23Fix rare race condition in DetsHans Bolinder
The correction is due to the the evil testcase dets_SUITE:simultaneous_open(). If the process repairing a Dets file is killed (should normally never happen), and another process tries to repair the file, a temporary file from the first process could live on for a while, even after a successful call to file:delete(). This has only been seen on W-nd-ows, where it is a known problem. There are other ways to deal with the problem (rename the file; use some other filename), but we continue using one certain filename in order to be as backwards compatible as possible.
2014-10-23Merge branch 'maint'Hans Bolinder
* maint: debugger: clean up Common Test adaption
2014-10-23Merge branch 'hb/debugger/ct_line_cleanup' into maintHans Bolinder
* hb/debugger/ct_line_cleanup: debugger: clean up Common Test adaption
2014-10-23Merge branch 'hb/dialyzer/compiler_option_asm_removed'Hans Bolinder
* hb/dialyzer/compiler_option_asm_removed: dialyzer: remove recognition of the compiler option 'asm'
2014-10-22ssh: fix .app and .appup errorsHans Nilsson
2014-10-22ssh: remove supervisors for crashed connection workerHans Nilsson
2014-10-22ssh: Print supervisor tree (on demand).Hans Nilsson