aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-07-25Merge branch 'maint'Björn-Egil Dahlberg
2012-07-25Merge branch 'egil/fix-install-osx-readme' into maintBjörn-Egil Dahlberg
* egil/fix-install-osx-readme: Clean up Install Erlang on OSX
2012-07-25Clean up Install Erlang on OSXBjörn-Egil Dahlberg
2012-07-25Merge branch 'maint'Björn-Egil Dahlberg
2012-07-25Merge branch 'egil/fix-inet-bit8-doc' into maintBjörn-Egil Dahlberg
* egil/fix-inet-bit8-doc: doc: Fix faulty tag in inet bit8 documentation
2012-07-24doc: Fix faulty tag in inet bit8 documentationBjörn-Egil Dahlberg
2012-07-19Merge branch 'maint'Lukas Larsson
* maint: Fix bug where auto skipped tcs would disappear Allow non configlist returns from other cths Fix close of suite when end_per_suite is skipped
2012-07-19Merge branch 'lukas/common_test/surefire_fix_skipped_end/OTP-10158' into maintLukas Larsson
* lukas/common_test/surefire_fix_skipped_end/OTP-10158: Fix bug where auto skipped tcs would disappear Allow non configlist returns from other cths Fix close of suite when end_per_suite is skipped
2012-07-19Merge branch 'lukas/benchmarks/OTP-10156'Lukas Larsson
* lukas/benchmarks/OTP-10156: Add mnesia tpc benchmark Add estone benchmarks to ts benchmark framework Add framework to ts to run benchmarks
2012-07-19Merge branch 'maint'Lukas Larsson
* maint: Add ct:notify and ct:sync_notify
2012-07-19Merge branch 'lukas/common_test/ct_notify/OTP-10157' into maintLukas Larsson
* lukas/common_test/ct_notify/OTP-10157: Add ct:notify and ct:sync_notify
2012-07-19Add ct:notify and ct:sync_notifyLukas Larsson
2012-07-19Add mnesia tpc benchmarkLukas Larsson
2012-07-19Add estone benchmarks to ts benchmark frameworkLukas Larsson
2012-07-19Add framework to ts to run benchmarksLukas Larsson
2012-07-19Merge branch 'lukas/runtime_tools/dtrace_userguide/OTP-10155'Lukas Larsson
* lukas/runtime_tools/dtrace_userguide/OTP-10155: Add DTRACE and SYSTEMTAP howtos as User Guide
2012-07-19Add DTRACE and SYSTEMTAP howtos as User GuideLukas Larsson
2012-07-19Merge branch 'lukas/add-howto-folder/OTP-10154'Lukas Larsson
* lukas/add-howto-folder/OTP-10154: Add a testing HOWTO Move README and INSTALL to HOWTO folder Fix missing accounting for outbound distribution bytes.
2012-07-19Add a testing HOWTOLukas Larsson
2012-07-19Move README and INSTALL to HOWTO folderLukas Larsson
2012-07-18Fix missing accounting for outbound distribution bytes.Rick Reed
2012-07-18Update preloadedHenrik Nord
2012-07-18Merge branch 'maint'Henrik Nord
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam lib/kernel/src/code.erl
2012-07-18Update preloadedHenrik Nord
2012-07-18Merge branch 'ta/prim_archive-reloading' into maintHenrik Nord
* ta/prim_archive-reloading: escript_SUITE: remove gratuitous space [erts,kernel,stdlib] fix escript/primary archive reloading Conflicts: erts/preloaded/src/erl_prim_loader.erl OTP-10151
2012-07-18Merge branch 'ms/correct-formating-in-exit' into maintHenrik Nord
* ms/correct-formating-in-exit: Correct formating in exit error messages OTP-10148
2012-07-18Merge branch 'tc/rpc-call-fix' into maintHenrik Nord
* tc/rpc-call-fix: Fix rpc:call/5 for local calls with a finite Timeout OTP-10149
2012-07-18Merge branch 'jv/forms-source' into maintHenrik Nord
* jv/forms-source: Allow the source to be set when compiling forms OTP-10150
2012-07-18Merge branch 'at/fix_asn1_typo' into maintHenrik Nord
* at/fix_asn1_typo: Fix typo error in selected decode function OTP-10152
2012-07-17Update preloadedLukas Larsson
2012-07-17Merge branch 'maint'Lukas Larsson
* maint: erts: add space before '*' in some function prototypes ic: add space before '*' in some function prototypes Fix a bug regarding spaces in C function prototypes Update preloaded Add tests for problems with handling of primary archive Add comments to make erl_prim_loader primary archive handling more readable Fix erl_prim_loader errors in handling of primary archive Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2012-07-16Merge branch 'hb/erl_docgen/cref_spaces/OTP-10138' into maintHans Bolinder
* hb/erl_docgen/cref_spaces/OTP-10138: erts: add space before '*' in some function prototypes ic: add space before '*' in some function prototypes Fix a bug regarding spaces in C function prototypes
2012-07-11Merge branch 'siri/erl_prim_loader/archive-scripts/OTP-10071' into maintSiri Hansen
* siri/erl_prim_loader/archive-scripts/OTP-10071: Update preloaded Add tests for problems with handling of primary archive Add comments to make erl_prim_loader primary archive handling more readable Fix erl_prim_loader errors in handling of primary archive
2012-07-11Merge branch 'lukas/erts/fix_enable_proc_lcnt'Lukas Larsson
OTP-10051 * lukas/erts/fix_enable_proc_lcnt: Use process macro instead of array
2012-07-11erts: add space before '*' in some function prototypesHans Bolinder
2012-07-11ic: add space before '*' in some function prototypesHans Bolinder
2012-07-11Fix a bug regarding spaces in C function prototypesHans Bolinder
Thanks to Richard O'Keefe for pointing the bug out.
2012-07-10Merge branch 'maint'Gustav Simonsson
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-10Update preloadedSiri Hansen
erl_prim_loader.beam
2012-07-10Add tests for problems with handling of primary archiveSiri Hansen
Thanks to Tuncer Ayaz for co-authoring.
2012-07-09Add comments to make erl_prim_loader primary archive handling more readableSiri Hansen
This commit introduces no functional change. It only adds comments and changes some function/variable names.
2012-07-09Fix erl_prim_loader errors in handling of primary archiveSiri Hansen
The following errors have been corrected: * If primary archive was named "xxx", then a file in the same directory named "xxxyyy" would be interpreted as a file named yyy inside the archive. * erl_prim_loader did not correctly create and normalize absolute paths for primary archive and files inside it, so unless given with exact same path files inside the archive would not be found. E.g. if escript was started as /full/path/to/xxx then "./xxx/file" would not be found since erl_prim_loader would try to match /full/path/to/xxx with /full/path/to/./xxx. Same problem with ../. * Depending on how the primary archive was built, erl_prim_loader:list_dir/1 would sometimes return an empty string inside the file list. This was a virtual element representing the top directory of the archive. This has been removed. Thanks to Tuncer Ayaz and Shunichi Shinohara for reporting and co-authoring corrections.
2012-07-06escript_SUITE: remove gratuitous spaceTuncer Ayaz
2012-07-06[erts,kernel,stdlib] fix escript/primary archive reloadingTuncer Ayaz
If the mtime of an escript/primary archive file changes after being added to the code path, correctly reload the archive and update the cache. The existing code didn't consider that it might be a zip archive and failed: =ERROR REPORT==== 3-Aug-2011::09:21:21 === File operation error: bad_central_directory. Target: /escript_archive/module.beam. Function: get_file. Process: code_server. Thanks David Reid and Hakan Mattson.
2012-07-06Merge branch 'maint'Henrik Nord
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-05Merge branch 'sverk/missing-distr-stats'Sverker Eriksson
* sverk/missing-distr-stats: Fix missing accounting for outbound distribution bytes.