aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-01-31erts: Correct incorrect assertion in erl_alloc_util.cBjörn Gustavsson
The incorrect assertion would fire when '+Muramv true' has been given, i.e. when a reallocation always forces a move. Change the assertion to not call the lock checker if the mutex is not used (because the allocator will only be accessed from a specific scheduler and thus no lock is needed).
2012-01-30Merge branch 'maint-r15' into maintMicael Karlberg
2012-01-30Merge branch 'lukas/kernel/os_mon_in_file_SUITE/OTP-9889' into maintLukas Larsson
* lukas/kernel/os_mon_in_file_SUITE/OTP-9889: Use os_mon to get system information
2012-01-30Use os_mon to get system informationLukas Larsson
2012-01-26Merge branch 'bjorn/erts/fix-hipe-crash/OTP-9886' into maintBjörn Gustavsson
* bjorn/erts/fix-hipe-crash/OTP-9886: Fix crash in trace_info({M,F,A}, Flags) when M:F/A has native code
2012-01-26Update primary bootstrapBjörn Gustavsson
2012-01-26Merge branch 'bjorn/compiler/bif-call-bug/OTP-9866' into maintBjörn Gustavsson
* bjorn/compiler/bif-call-bug/OTP-9866: erl_lint: Disallow call to is_record/3 if there is a local is_record/3 Ensure that generated record operations don't call local functions
2012-01-26erl_lint: Disallow call to is_record/3 if there is a local is_record/3Björn Gustavsson
Attempting to call is_record/3 (without an erlang: prefix) from a guard if there was a local function named is_record/3 would cause a compiler crash. For consistency with other guard tests, disallow the call. is_record/2 in a guard will still be allowed (and work correctly) even if there is a local is_record/2. It could be argued that is_record/2 should be handled in the same way as is_record/3, but changing that now could break working code.
2012-01-25compile_SUITE: Eliminate race conditionBjörn Gustavsson
Compiling the same source code with the same options may not produce the same BEAM file because the compilation time is included in the "CInf" chunk.
2012-01-25Fix crash in trace_info({M,F,A}, Flags) when M:F/A has native codeBjörn Gustavsson
2012-01-25Merge branch 'bmk/snmp/snmp4216_integration/r15' into maint-r15Erlang/OTP
* bmk/snmp/snmp4216_integration/r15: [snmp] Releasse notes cleanup [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-25Merge branch 'maint-r14' into bmk/snmp/snmp4216_integration/r15Micael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/notes_history.xml
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-25Ensure that generated record operations don't call local functionsBjörn Gustavsson
Consistently use external (remote) calls to the BIFs element/2, setelement/3, and is_record/3.
2012-01-24Merge branch 'bmk/snmp/snmp4216_integration/r14' into maint-r14Erlang/OTP
* bmk/snmp/snmp4216_integration/r14: [snmp] Releasse notes cleanup [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-24[snmp] Releasse notes cleanupMicael Karlberg
2012-01-24[snmp] Merged from R13B and also fixed appupMicael Karlberg
Merge from R13B maintenance branch (snmp-4.17.3), fixed appup and source diff (there is some between snmp-4.17.3 and 4.21.6). Merge branch 'maint-r13' into bmk/snmp/snmp4216_integration/r14 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/agent/snmpa.erl lib/snmp/src/agent/snmpa_agent.erl lib/snmp/src/agent/snmpa_trap.erl lib/snmp/src/app/snmp.appup.src lib/snmp/test/snmp_agent_test.erl lib/snmp/vsn.mk
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-20Merge branch 'bmk/snmp/snmp4173_integration/r13' into maint-r13Erlang/OTP
* bmk/snmp/snmp4173_integration/r13: [snmp/agent] Incorrect mib server cache gclimit update [snmp] Updated doc and fixed wrequest create macros [snmp] Be more verbose in the worker procs [snmp] Add a more informative return value when the trap sending fails [snmp] Fixed the mt_trap test-case [snmp] Maximum number of varbinds in a Get-BULK response [snmp] Correted the expect bug in the snmp test utility [snmp] Mostly added some more verbosity stuff
2012-01-20Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
2012-01-20Merge branch 'bmk/snmp/agent/get_bulk_with_large_max_reps/OTP-9700' into ↵Micael Karlberg
bmk/snmp/snmp4173_integration/r13
2012-01-19[snmp/agent] Incorrect mib server cache gclimit updateMicael Karlberg
Mib server cache gclimit update function incorrectly calls age update function. The gclimit update function update_mibs_cache_gclimit/1 incorrectly called update_mibs_cache_age/2 update function. OTP-9868
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-17Merge branch 'bmk/inets/inets573_integration' into maint-r14Erlang/OTP
* bmk/inets/inets573_integration: [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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:00:34 +0000