aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-07-11Merge branch 'bmk/inets/httpc/cancel_request/OTP-10092' into ↵Micael Karlberg
bmk/inets/inets591_integration
2012-07-11Merge branch 'bmk/inets/httpc-doc-elaborate/OTP-10114' into ↵Micael Karlberg
bmk/inets/inets591_integration
2012-07-10Merge branch 'gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130' ↵Gustav Simonsson
into maint * gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130: Change testcase of gen_server:enter_loop/4 with global scope to match on result of a gen_server:call/2 Correct guard matching in gen_server:enter_loop/4 to match global scope in ServerName without timeout.
2012-07-06Merge branch 'slf/dtrace-nif-N-probes' into maintHenrik Nord
* slf/dtrace-nif-N-probes: Remove crufty scaffolding code Add 1024 separate USDT probes to dyntrace.erl and dyntrace.c Conflicts: lib/runtime_tools/src/dyntrace.erl OTP-10143
2012-07-06Merge branch 'slf/dyntrace-comment-and-func-cleanup' into maintHenrik Nord
* slf/dyntrace-comment-and-func-cleanup: dyntrace.erl comment cleanup and unused function removal OTP-10141
2012-07-06Merge branch 'sz/dtrace-message-send-fix' into maintHenrik Nord
* sz/dtrace-message-send-fix: DTrace bug in message-send OTP-10142
2012-07-04Merge branch 'sverk/hipe-arm-fix' into maintSverker Eriksson
* sverk/hipe-arm-fix: hipe_arm.c: remove dead code Workaround gcc bug affecting ARM debug build Fix compile error of HIPE enabled DEBUG emulator for ARM Fix hipe bif calling bug on ARM Add armv7l and armv5tejl as a recognized ARM architectures OTP-10137
2012-07-04Change testcase of gen_server:enter_loop/4 with global scopeGustav Simonsson
to match on result of a gen_server:call/2
2012-07-03Correct guard matching in gen_server:enter_loop/4Gustav Simonsson
to match global scope in ServerName without timeout. OTP-10130
2012-07-03Merge branch 'hb/kernel/fix_spec_disk_log/OTP-10131' into maintHans Bolinder
* hb/kernel/fix_spec_disk_log/OTP-10131: Correct the type of the disk log header
2012-07-02Correct the type of the disk log headerHans Bolinder
Thanks to Niclas Eklund.
2012-06-29Merge branch 'egil/install-osx' into maintBjörn-Egil Dahlberg
2012-06-29doc: Update MacOSX install HowTo for Xcode 4.3Björn-Egil Dahlberg
2012-06-29Fix nonsense of eprof docRicardo Catalinas Jiménez
2012-06-25hipe_arm.c: remove dead codeMikael Pettersson
erts/emulator/hipe/hipe_arm.c started out as a clone of hipe_ppc.c, with #ifdefs to select ARM-specific code. Somehow those #ifdefs never got cleaned out, resulting in fairly ugly-looking code. This eliminates the #ifdefs, deletes dead PowerPC-specific code, and keeps only the ARM-specific code. I've verified that the exact same assembly code is generated for hipe_arm.c before and after this patch (if you compile without -g, with -g there are unavoidable changes to the debug data). Signed-off-by: Mikael Pettersson <[email protected]>
2012-06-25Workaround gcc bug affecting ARM debug buildSverker Eriksson
2012-06-25Fix compile error of HIPE enabled DEBUG emulator for ARMSverker Eriksson
2012-06-25Fix hipe bif calling bug on ARMSverker Eriksson
Bug introduced in R15.
2012-06-25Add armv7l and armv5tejl as a recognized ARM architecturesSverker Eriksson
2012-06-25Update primary bootstrapBjörn Gustavsson
2012-06-25Merge branch 'bjorn/compiler/eliminate-bottleneck/OTP-10123' into maintBjörn Gustavsson
* bjorn/compiler/eliminate-bottleneck/OTP-10123: sys_pre_expand: Eliminate bottleneck for modules with many functions
2012-06-25Merge branch 'rj/fix-eprof-doc' into maintHenrik Nord
* rj/fix-eprof-doc: Fix nonsense of eprof doc OTP-10121
2012-06-25Merge branch 'tab/fix-indentation-records-emacs' into maintHenrik Nord
* tab/fix-indentation-records-emacs: Fix indentation of record fields in Emacs OTP-10120
2012-06-25Merge branch 'rj/fix-et-doc' into maintHenrik Nord
* rj/fix-et-doc: Fix typo in ET doc OTP-10119
2012-06-20Merge branch 'ia/ssl/recv-bug/OTP-10118' into maintIngela Anderton Andin
* ia/ssl/recv-bug/OTP-10118: ssl: Fix bug in the handling of remote connection closure of {active,false} ssl sockets.
2012-06-20Merge branch 'rickard/thr-prgr-use/OTP-10116' into maintRickard Green
* rickard/thr-prgr-use/OTP-10116: Fix faulty use of thread progress in handle_aux_work()
2012-06-20sys_pre_expand: Eliminate bottleneck for modules with many functionsBjörn Gustavsson
Use a gb_set instead of an ordset to store the set of defined functions in the module to avoid quadritic time complexity.
2012-06-20Merge branch 'ia/ssl/pem-cache-bug' into maintIngela Anderton Andin
* ia/ssl/pem-cache-bug: ssl: Fix pem cache bug
2012-06-19ssl: Fix pem cache bugIngela Anderton Andin
A general case clause was put before a less general so that the less general case would never match.
2012-06-18Fix faulty use of thread progress in handle_aux_work()Rickard Green
As an optimization old thread progress data was kept and used in handle_aux_work() in erl_process.c. This could cause memory to be deallocated at a later time than intended, which is quite harmless. This has, however, now been fixed.
2012-06-15ssl: Fix bug in the handling of remote connection closure of {active,false} ↵Ingela Anderton Andin
ssl sockets.
2012-06-14Added missing comma and set proper versionMicael Karlberg
2012-06-14Merge branch 'ja/jl-httpc-doc-elaborate' into ↵Micael Karlberg
bmk/inets/httpc-doc-elaborate/OTP-10114
2012-06-13Merge branch 'ia/ssl/bottlenecks/OTP-10113' into maintIngela Anderton Andin
* ia/ssl/bottlenecks/OTP-10113: ssl: Test case fixes ssl: Avoid second bottleneck in supervisor ssl: File handling optimization ssl: Simpler PEM cache ssl: Refactored for readability ssl: Use md5 as file ref id instead of filenames ssl: Move ets:select bottleneck in server ssl: Renegotiate updates session id in gen_fsm state ssl: Use ordered_set in cache ssl: Move and avoid ets:select bottleneck in client ssl: Reuse session check optimization ssl: Avoid supervior bottleneck
2012-06-12Merge branch 'ia/ssh/missing-reason-in-catch-exit/OTP-10112' into maintIngela Anderton Andin
* ia/ssh/missing-reason-in-catch-exit/OTP-10112: Improved handling of multiple closes
2012-06-12Fix indentation of record fields in EmacsTomas Abrahamsson
In some situations, the indentation of record fields in Emacs was strange. This example below shows how Emacs previously would indent two similar pieces of code very differently: some_function_with_a_very_long_name() -> #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{ field1=a, field2=b}. x() -> #some_record_name{ field1=a, field2=b}. This changes the indentation to be like below for both cases: some_function() -> #some_record{ field1=a, field2=b}.
2012-06-12Fix nonsense of eprof docRicardo Catalinas Jiménez
2012-06-12ssl: Test case fixesIngela Anderton Andin
2012-06-09Elaborate on timeouts in the httpc documentationJesper Louis Andersen
All timeouts are in milliseconds. Reflect this in the documentation so it is explicit that it is so.
2012-06-08ssl: Avoid second bottleneck in supervisorIngela Anderton Andin
Do proc_lib:spawn_link instead of proc_lib:start_link as synchronized init is not used/needed anyway.
2012-06-08ssl: File handling optimizationIngela Anderton Andin
Avoid cach validation with file:file_info/2 as this i too expensive and causes a bottleneck in the file server. Instead we expose a new API function ssl:clear_pem_cache/0 to deal with the problem. As we think it will be of occasional use and the normal case is that the cache will be valid we think it is the right thing to do. Convert file paths to binary representation in the ssl API module to avoid uncessarry calls in file later on. Also add sanity checks for openssl versions in testsuite due to new openssl bugs.
2012-06-08Merge branch 'lukas/otp/install_with_whitespace/OTP-10107' into maintLukas Larsson
* lukas/otp/install_with_whitespace/OTP-10107: Update to work with space in include path Update to work with whitespace in exec path
2012-06-08Update to work with space in include pathLukas Larsson
OTP-10109
2012-06-08ssl: Simpler PEM cacheIngela Anderton Andin
2012-06-08ssl: Refactored for readabilityIngela Anderton Andin
Instance of state variable that are "updated" in a function is called for example State0 and the last instance, that should be returned, is called State possible intermidiat versions are suffixed by increasing numbers. State0 may be rturned in error cases. Avoid nesting case statments.
2012-06-08ssl: Use md5 as file ref id instead of filenamesDan Gudmundsson
Aviods storing a lot of data
2012-06-08ssl: Move ets:select bottleneck in serverDan Gudmundsson
Only use ssl_manager for selecting new ids to guarantee uniqueness, but reuse check does not need to be performed by the manager.
2012-06-08ssl: Renegotiate updates session id in gen_fsm stateIngela Anderton Andin
The session id keept in the connection processes state must be updated to be the id selected by ssl_handshake:client_hello, failing to do so will cause a crash if the session is not reused.
2012-06-08ssl: Use ordered_set in cacheDan Gudmundsson
So we can use partial bound keys for matching
2012-06-08ssl: Move and avoid ets:select bottleneck in clientIngela Anderton Andin
Do not use ssl_manager process for selecting an id. It's unnecessary to involve the manager process at all on the client side.