aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-02-03Do not test sslv2 rejection with openssl-1.*Ingela Anderton Andin
Reason sslv2 support seems to be by default turned of.
2012-02-01Merge branch 'maint-r14' into maintBjörn Gustavsson
* maint-r14: Prepare release
2012-02-01Prepare releaseErlang/OTP
2012-02-01Merge branch 'hb/erl_docgen/multiple_funcs/OTP-9877' into maintHans Bolinder
* hb/erl_docgen/multiple_funcs/OTP-9877: Optimize and improve handling of multiple func:s.
2012-02-01Optimize and improve handling of multiple func:s.Hans Bolinder
2012-02-01Merge branch 'dgud/mnesia/table-locks/OTP-9890' into maintDan Gudmundsson
* dgud/mnesia/table-locks/OTP-9890: [Mnesia] More optimizations [Mnesia] Optimize double ets_lookups [Mnesia] Optimize for lookup instead of match_object [Mnesia] First try with ordered_set instead of bag
2012-01-31Merge branch 'rj/spaces-xmerl-doc' into maintHenrik Nord
* rj/spaces-xmerl-doc: Add missing spaces in xmerl doc OTP-9873
2012-01-31[Mnesia] More optimizationsDan Gudmundsson
If a transaction releases a write, it can be deleted directly since no read locks or other write locks can be present
2012-01-31[Mnesia] Optimize double ets_lookupsDan Gudmundsson
2012-01-31[Mnesia] Optimize for lookup instead of match_objectDan Gudmundsson
5% faster on tpcb
2012-01-31[Mnesia] First try with ordered_set instead of bagDan Gudmundsson
Switch to ordered_set so match_object matches partially bound keys, more efficient.
2012-01-31Merge branch 'dgud/observer/bug-fixes/OTP-9878' into maintDan Gudmundsson
* dgud/observer/bug-fixes/OTP-9878: [observer] Fixed refresh interval for table viewer [observer] Improved term formatting in table viewer [observer] Fixed regexp error handling [observer] Fix refresh dead process crash [observer] Fix bugs in edit table object [observer] Fix index reporting bug
2012-01-31Merge branch 'rickard/sched-compact-load/OTP-9695' into maint-r14Erlang/OTP
* rickard/sched-compact-load/OTP-9695: Add switch that can disable scheduler compaction of load
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-27[observer] Fixed refresh interval for table viewerMatthew Evans
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-24[observer] Improved term formatting in table viewerDan Gudmundsson
Format strings as string not integer lists
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-24[observer] Fixed regexp error handlingPeti Gömöri
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