aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-01-25Fix crash in trace_info({M,F,A}, Flags) when M:F/A has native codeBjörn Gustavsson
2012-01-25Update primary bootstrapBjörn Gustavsson
2012-01-25Merge branch 'bjorn/compiler/get-in-try/OTP-9867' into maintBjörn Gustavsson
* bjorn/compiler/get-in-try/OTP-9867: compiler: Correct live calculation when get/1 is used in try...catch
2012-01-25Merge branch 'lukas/os_mon/work_in_source_tree/OTP-9883' into maintLukas Larsson
* lukas/os_mon/work_in_source_tree/OTP-9883: Look for port in priv/bin/arch/ as well as priv/bin/
2012-01-25Merge branch 'bjorn/kernel/on_load-bug/OTP-9875' into maintBjörn Gustavsson
* bjorn/kernel/on_load-bug/OTP-9875: Fix on_load handling in modules loaded by code:load_binary/3
2012-01-25Look for port in priv/bin/arch/ as well as priv/bin/Lukas Larsson
2012-01-25Merge branch 'raimo/parallel-make/OTP-9857' into maintRaimo Niskanen
* raimo/parallel-make/OTP-9857: hipe: Fix rtl dependencies erts: Simplify toplevel makefile due to better dependencies erts: Fix make omissions for void emulators erts: Fix dependencies between targets generate and depend erts: Cleanup dependencies for target generate erts,tools: Fix parallel make for erts/lib_src erts: Fix parallel make for emulator zlib Conflicts: erts/emulator/Makefile.in
2012-01-24Merge branch 'hb/kernel/correct_contracts/OTP-9874' into maintHans Bolinder
* hb/kernel/correct_contracts/OTP-9874: Correct two contracts in gen_sctp.erl
2012-01-24hipe: Fix rtl dependenciesRaimo Niskanen
2012-01-24Merge branch 'egil/fix-profiler-pid' into maintBjörn-Egil Dahlberg
* egil/fix-profiler-pid: erts: Do not profile profiler pid (non smp) erts: Do not profile profiler pid (smp) Revert "erts: Do not profile system profiler pid"
2012-01-23erts: Simplify toplevel makefile due to better dependenciesRaimo Niskanen
2012-01-23erts: Fix make omissions for void emulatorsRaimo Niskanen
2012-01-23erts: Fix dependencies between targets generate and dependRaimo Niskanen
* Make generate and depend.mk automatically. * Do not make depend.mk for targets clean and generate. * Remove old replaced CREATE_DIRS cruft. * Fiercer remove by target clean. * Move depend.mk to Target/Type/Flavor directory.
2012-01-23Fix on_load handling in modules loaded by code:load_binary/3Björn Gustavsson
In "13.4 Running a function when a module is loaded" in the Reference Manual, it is said that: A process that calls any function in a module whose on_load function has not yet returned will be suspended until the on_load function has returned. That did not work if the module was loaded using code:load_binary/3. Instead, the callers would get an 'undef' exception.
2012-01-23Merge branch 'maint-r15' into maintMicael Karlberg
2012-01-23Correct two contracts in gen_sctp.erlHans Bolinder
binary should be binary().
2012-01-23Merge branch 'jz/error-logic-efile_sendfile' into maintHenrik Nord
* jz/error-logic-efile_sendfile: erts: minor fix for unnecessary condition OTP-9872
2012-01-23Merge branch 'jz/sendfile_chunk_size' into maintHenrik Nord
* jz/sendfile_chunk_size: erts: change SENDFILE_CHUNK_SIZE from signed to unsigned Conflicts: erts/emulator/drivers/unix/unix_efile.c OTP-9872
2012-01-23Merge branch 'henrik/wx/fix-pdf-name/OTP-9850' into maintHenrik Nord
* henrik/wx/fix-pdf-name/OTP-9850: Change the name of generated pdf file for documentation consistency
2012-01-20Merge branch 'bmk/inets/inets581_integration/r15' into maint-r15Erlang/OTP
* bmk/inets/inets581_integration/r15: [inets/httpc] The client incorrectly streams 404 responses [inets/httpc] Add proper code change code [inets/httpc] Add test case [inets] Add proper release notes for OTP-9847 [inets/httpc] Fix the selection of session for keep-alive mode When selecting a session, the "state" of the session (specifically if the server has responded) was not taken into account. Attempting to fix this, a "state" field (actually available) has been added to the session record. [ftp] Fails to open IPv6 connection
2012-01-20[inets] Merged from R14B and also fixed appupMicael Karlberg
Merge from R14B integration branch (for inets-5.7.3) and fixed appup and corresponding code-change code to work in new version (inets-5.8.1). Also some minor (R15B specific) test suite fixes. Merge branch 'bmk/inets/inets573_integration' into bmk/inets/inets581_integration/r15 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/http_client/httpc_internal.hrl lib/inets/src/inets_app/inets.appup.src lib/inets/vsn.mk
2012-01-19Merge branch 'maint-r15' into maintMicael Karlberg
2012-01-18compiler: Correct live calculation when get/1 is used in try...catchBjörn Gustavsson
In the following code excerpt, the instruction marked below was incorrectly removed: . . . {'try',{y,2},{f,TryCaseLabel}}. {bif,get,{f,0},[{x,0}],{x,0}}. {move,{x,1},{y,0}}. {move,{x,3},{y,1}}. <======= Incorrectly removed {jump,{f,TryEndLabel}}. {label,TryEndLabel}. {try_end,{y,2}}. {deallocate,3}. return. {label,TryCaseLabel}. {try_case,{y,2}}. . . . beam_utils indicated that {y,1} was not used at TryEndLabel, which by itself is correct. But it is still not safe to remove the instruction, because {y,1} might be used at TryCaseLabel if an exception occurs. Noticed-by: Eric Merritt
2012-01-18Update primary bootstrapBjörn Gustavsson
2012-01-18Merge branch 'bjorn/compiler/bif-call-bug/OTP-9866' into maintBjörn Gustavsson
* bjorn/compiler/bif-call-bug/OTP-9866: erl_lint: Consistently reject local calls from guards
2012-01-18Merge branch 'egil/fix-error_logger-calendar/OTP-9854' into maintBjörn-Egil Dahlberg
* egil/fix-error_logger-calendar/OTP-9854: stdlib: Refactor to tag all times in error logger stdlib: Use utc time as base in error logger
2012-01-18Merge branch 'raimo/64-bit-efile_drv/OTP-9820' into maintErlang/OTP
* raimo/64-bit-efile_drv/OTP-9820: file_SUITE: Assume 64-bit windows has enough memory erts: Badarg if port output overflows iov_len prim_file_SUITE: large_file success depends on wordsize file_SUITE: Increase timeout for large_file file_SITE,prim_file_SUITE: Accept old OpenBSD pecularity prim_file_SUITE: large_write - meaner test data and check result content file_SUITE: large_write - check mem size before creating huge binary erts: rewrite efile_writev to handle partial writes correctly erts: Bugfix - driver_deq freed wrong length due to short type (int) prim_file_SUITE: Add large_write/1 file_SUITE: Add large_write/1 file_SUITE: Refactor large_file/1 file_SUITE: Fix unix_free/1
2012-01-17erl_lint: Consistently reject local calls from guardsBjörn Gustavsson
If a guard test (such as is_list/1) has a local definition in a module (or is imported), erl_lint will reject a call to it from a guard if the call is not at the top-level: foo(L) when is_list(L) =:= true -> %% Will be rejected. ok. is_list(_) -> ok. But if the call is at the top-level, it will be accepted (and cause a crash in a later compiler pass): foo(L) when is_list(L) -> %% Will be accepted by erl_lint ok. is_list(_) -> ok. This inconsistency was an oversight introduced when it became possible to override BIFs with local definitions.
2012-01-17Merge branch 'bmk/snmp/snmp4215_integration/r15' into maint-r15Erlang/OTP
* bmk/snmp/snmp4215_integration/r15: [snmp] Fixed release notes. Used wrong ticket number [snmp/agent] Updated appup file [snmp/agent] Updated release notes [snmp/agent] Removed the (unused) serializer part [snmp/agent] Use unique temporary file name during vacm table dumnping [snmp/agent] Add common timestamp format function. [snmp/agent] Synchronization feature added [snmp/agent] Creating a unique temporary file whe dumping vacm [snmp/agent] Changed version [snmp/agent] Found another old-style fun (2-tuple) [snmp/agent] Removed use of old style tuple funs
2012-01-17Merge branch 'bmk/snmp/snmp4215_integration/r14' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r15 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/notes_history.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-17erts: Do not profile profiler pid (non smp)Björn-Egil Dahlberg
2012-01-16erts: Do not profile profiler pid (smp)Björn-Egil Dahlberg
2012-01-16Revert "erts: Do not profile system profiler pid"Björn-Egil Dahlberg
This reverts commit 4a8ce05083b9c88b94560f400370dbc656893b6e. * Above commit has a lock order violation
2012-01-16erts: Cleanup dependencies for target generateRaimo Niskanen
2012-01-16[snmp] Fixed release notes. Used wrong ticket numberMicael Karlberg
OTP-9783
2012-01-16Merge branch 'ia/ssh/test-maint' into maintIngela Anderton Andin
* ia/ssh/test-maint: Remove generation of new test keys, use checked in test keys Improve test case structure so that test should pass on all platforms Exec test case should ignore stderr messages Do not run ssh_to_openssh_SUITE if there is no oppenssh server running
2012-01-13Merge branch 'maint-r15' into maintRaimo Niskanen
2012-01-13Merge branch 'raimo/opu-fixes' into maint-r15Raimo Niskanen
* raimo/opu-fixes: inet_res_SUITE: Improve portability of run-named inet_res_SUITE: Go back to old way to kill test name server
2012-01-13Merge branch 'raimo/opu-fixes' into maintRaimo Niskanen
* raimo/opu-fixes: inet_res_SUITE: Improve portability of run-named
2012-01-13erts,tools: Fix parallel make for erts/lib_srcRaimo Niskanen
Use a make timestamp file to condense dependencies to some part(s) of erts/lib_src build results.
2012-01-13Merge branch 'bmk/inets/httpc/streaming_404/r14/OTP-9860' into ↵Micael Karlberg
bmk/inets/inets573_integration Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
2012-01-13[inets/httpc] The client incorrectly streams 404 responsesMicael Karlberg
The client incorrectly streams 404 responses. The documentation specifies that only 200 and 206 responses shall be streamed. OTP-9860
2012-01-13erts: Fix parallel make for emulator zlibRaimo Niskanen
Convert the recursive make for zlib into a make include file.
2012-01-12Merge branch 'alind/public_key/gitignore_fix' into maintAdam Lindberg
* alind/public_key/gitignore_fix: [public_key] Fix .gitignore to use relative paths
2012-01-12[public_key] Fix .gitignore to use relative pathsAdam Lindberg
2012-01-12Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into ↵Micael Karlberg
bmk/snmp/snmp4215_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
2012-01-12[snmp/agent] Updated appup fileMicael Karlberg
2012-01-12[snmp/agent] Updated release notesMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Removed the (unused) serializer partMicael Karlberg
OTP-9851
2012-01-12[snmp/agent] Use unique temporary file name during vacm table dumnpingMicael Karlberg
Removed the use synchronization mechanism during vacm table dumping. This could not be placed in the master agent since it was sometimes used from the master agent. Also is was credated and used from the top agent supervisor, befor the master agent process was created... OTP-9851