aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-07-31erlsrv: gracefully stop emulator on Windows shutdownJan Kloetzke
Windows will send the SERVICE_CONTROL_SHUTDOWN event to the service control handler when shutting down the system. Instead of ignoring the event, erlsrv will now invoke the stop action. Likewise, the Erlang emulator (and it's port drivers) must not quit upon reception of the CTRL_SHUTDOWN_EVENT event in the console control handler.
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/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-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-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-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 '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 '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.