aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-10-30Merge branch 'hans/eldap/extensible_match_filter/OTP-12174' into maintHans Nilsson
* hans/eldap/extensible_match_filter/OTP-12174: eldap: vsn.mk updated. eldap: extensibleMatch added.
2014-10-30eldap: vsn.mk updated.Hans Nilsson
2014-10-30eldap: extensibleMatch added.Hans Nilsson
2014-10-30erts: Fix hanging in fd_stop on windowsLukas Larsson
When reaping ports the flushReplyEvent is not signalled and therefore an errornous loop check caused the emulator to hang forever during shutdown.
2014-10-29Merge branch 'maint'Sverker Eriksson
2014-10-29Merge branch 'sverk/etp-check-beam-ranges' into maintSverker Eriksson
* sverk/etp-check-beam-ranges: erts: Add gdb command etp-check-beam-ranges
2014-10-29erts: Add gdb command etp-check-beam-rangesSverker Eriksson
2014-10-29erts: Fix bug in beam_rangesSverker Eriksson
Symptom: VM on OSX (darwin11.4.2) with +Meamin running sasl tests, crashing when init:reboot() does erlang:purge_module(installer). Problem: Off-by-one bug in beam_ranges:find_range, returning the wrong range if the 'end' of one module is the 'start' of the next. This is only possible if using sys_alloc (+Meamin) as our own allocators always put block headers between allocated payload data.
2014-10-29ssh: Add basic ptty_alloc testsIngela Anderton Andin
2014-10-29Add 'trim_all' option to binary:split/3Christopher Faulet
This option can be set to remove _ALL_ empty parts of the result of a call to binary:split/3.
2014-10-28Merge branch 'maint'Sverker Eriksson
2014-10-28Merge branch 'sverk/cpool_fetch-dc_list-bug/OTP-12249' into maintSverker Eriksson
* sverk/cpool_fetch-dc_list-bug/OTP-12249: erts: Fix bug when delayed deallocated carrier is reused by cpool_fetch
2014-10-28Merge branch 'egil/nox/maps-match_specs/OTP-12270'Björn-Egil Dahlberg
* egil/nox/maps-match_specs/OTP-12270: erts: Fix return value from erts_maps_get to be const Properly support maps in match_specs Support maps in ms_transform Return pointer to value in erts_maps_get()
2014-10-28Fix a typo in the mnesia documentationSina Samavati
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-27erts: Fix return value from erts_maps_get to be constBjörn-Egil Dahlberg
From "warning: assignment discards qualifiers from pointer target type"
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-27Extract annotations from filter qualifiers in a type-friendly wayBjörn Gustavsson
Commit 78ce8917d started to use get_anno/1 to extract the line annotation from filter qualifiers in comprehensions, but this does not respect the spec of this function and resuls in a dialyzer warning. To make the code more type-friendly, introduce a get_qual_anno/1 function. Kostis Sagonas suggested that the function should be implemented similar to this to also ensure that the qualifiers are of the appropriate form: get_qual_anno({call,Line,_,_}) -> Line; get_qual_anno({op,Line,_,_,_}) -> Line; . . . get_qual_anno({var,Line,_}) -> Line. The problem is that it is difficult to know exacly which forms that may occur and the function will need to be updated if new abstract forms are added. Thus this implementation would complicate maintanance without any real payoff. Reported-by: Kostis Sagonas
2014-10-27Fix miscompilation when module contains multiple named funsAnthony Ramine
A module containing two named funs bearing the same name and arity could be miscompiled. Reported-by: Sam Chapin
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-26Fix "-smp disable" for emulator with dirty schedulersSteve Vinoski
Running "erl -smp disable" on an emulator built with dirty scheduler support caused problems such as segmentation violations and emulator status line outputs containing garbage. For example: $ erl -smp disable Segmentation fault (core dumped) and: $ erl -smp disable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [ds:10:4297895689:4299948152] [async-threads:280] This problem also caused the emulator smoke_test_SUITE to hit these same problems if run in an emulator started with the "-smp disable" option. Fix this segmentation violation by ensuring that dirty scheduler information is printed in the status line only when the emulator is compiled with ERTS_SMP enabled. With this fix in place, the smoke_test_SUITE now passes when the "-smp disable" option is used, and the emulator status line prints correctly for both "-smp enable" and "-smp disable": $ erl -smp enable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [smp:8:8] [ds:8:8:10] [async-threads:10] [kernel-poll:false] and: $ erl -smp disable Erlang/OTP 17 [DEVELOPMENT] [erts-6.2] [source] [64-bit] [async-threads:10] [kernel-poll:false]
2014-10-24Fix ssh_sftp:start_channel timeoutSimon Cornish
The {timeout, Timeout} option passed to ssh_sftp:start_channel is not applied to the early phases of the SSH protocol. For example, if the remote server fails to respond after the "hello" then the call will hang for as long as the server keeps the TCP connection alive. This patch passes the Timeout through to ssh:connect. In case the timeout occurs during these phases, {error, timeout} is returned.
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-23stdlib: fix a bug in qlc_SUITE.erlHans Bolinder