aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-03-09Merge pull request #2176 from josevalim/jv-beam-load-messageBjörn Gustavsson
Clarify beam_load error message on file/module mismatch
2019-03-08Merge branch 'maint'Péter Dimitrov
* maint: inets: Fix handling of erl_script_timeout Change-Id: Ie6028000b0bd45307477d837f63c51b2620faaea
2019-03-08Merge branch 'peterdmv/inets/httpd_erl_script_timeout/ERIERL-321/OTP-15669' ↵Péter Dimitrov
into maint * peterdmv/inets/httpd_erl_script_timeout/ERIERL-321/OTP-15669: inets: Fix handling of erl_script_timeout Change-Id: I6a90408de48df6b8b01f44e0b273507bcec27b13
2019-03-08inets: Fix handling of erl_script_timeoutPéter Dimitrov
When httpd was started with 'erl_script_timeout', the value of the option was converted to milliseconds before storage. Subsequent calls to httpd:info/1 returned the input value multiplied by 1000. This change fixes the handing of erl_script_timeout by storing the timeout in seconds and converting it to milliseconds before usage. Change-Id: Ic308d83b59ad0884e053f096f995754c89adcbf4
2019-03-08Merge pull request #2175 from jhogberg/john/erts/enif_term_type/OTP-15640John Högberg
erts: Add enif_term_type
2019-03-08Merge branch 'rickard/deprecations-removals-fix'Rickard Green
* rickard/deprecations-removals-fix: Better erl_interface deprecation warning implementation
2019-03-08Clarify beam_load error message on file/module mismatchJosé Valim
This is particularly important in case insensitive filesystems, where attempting to invoke a module with the wrong case leads to confusing error messages: 1> erlpress_core:foo(). beam/beam_load.c(1428): Error loading module 'erlpress_core': module name in object code is erlPress_core Loading of erlPress_core.beam failed: :badfile This commit replaces object code by BEAM file and improves the readability of the message.
2019-03-08Merge branch 'maint'Sverker Eriksson
2019-03-08Merge branch 'sverker/master/ets-no-mbuf-trapping/OTP-15660'Sverker Eriksson
* sverker/master/ets-no-mbuf-trapping/OTP-15660: erts: Remove ets traversal yielding if heap fragment
2019-03-08Merge pull request #2088 from josevalim/jv-start-distributionSiri Hansen
Add start_distribution to kernel environment OTP-15668
2019-03-08Merge branch 'sverker/maint/ets-no-mbuf-trapping/OTP-15660' into maintSverker Eriksson
* sverker/maint/ets-no-mbuf-trapping/OTP-15660: erts: Remove ets traversal yielding if heap fragment
2019-03-08Merge pull request #2174 from bjorng/bjorn/tune-beam-2Björn Gustavsson
Tune BEAM instructions for the new compiler (part 2)
2019-03-08Merge branch 'maint'Anders Svensson
2019-03-08Merge branch 'anders/diameter/21.3/OTP-15654' into maintAnders Svensson
* anders/diameter/21.3/OTP-15654: Update appup for diameter 2.2 in OTP 21.3
2019-03-08Merge branch 'anders/diameter/distribution/OTP-15398' into maintAnders Svensson
* anders/diameter/distribution/OTP-15398: Add diameter_dist_SUITE to exercise diameter_dist:route_session/2 Add consistent hashing to diameter_dist:route_session/2 Add options to diameter_dist:route_session/2 node selection Add diameter_dist for ready spawn_opt callbacks Tweak/document request handler callback Document acknowledgements in transport interface Fix comment typo
2019-03-08Merge branch 'maint'Ingela Anderton Andin
2019-03-08Merge branch 'ingela/ssl/ftp/continue/chunk-timing/ERIERL-316/OTP-15666' ↵Ingela Anderton Andin
into maint * ingela/ssl/ftp/continue/chunk-timing/ERIERL-316/OTP-15666: ssl: Correct active once emulation ftp: New test case
2019-03-08Merge pull request #2173 from essen/crypto-infoHans Nilsson
Add crypto:cipher_info/1 and crypto:hash_info/1 OTP-15655
2019-03-08Merge branch 'maint'Siri Hansen
2019-03-08Merge branch 'siri/logger/file-logging-improvements' into maintSiri Hansen
* siri/logger/file-logging-improvements: [logger] Add option file_check to logger_std_h [logger] Add log file rotation by options to logger_std_h [logger] Add better control of file modes in logger_std_h [logger] Refactor logger_std_h [logger] Make sure log file is re-opened with configured file options
2019-03-08[logger] Add option file_check to logger_std_hSiri Hansen
OTP-15663 This option indicates how often the handler shall check if the log file still exists and if the inode is changed.
2019-03-08[logger] Add log file rotation by options to logger_std_hSiri Hansen
OTP-15479 OTP-15662 New configuration map for logger_std_h: #{type => file, file => file:filename(), modes => [file:mode()], max_no_bytes => pos_integer() | infinity, max_no_files => non_neg_integer(), compress_on_rotate => boolean()} For backwards compatibility, the old variant for specifying the file name via the 'type' parameter is still supported, i.e. {file,FileName} and {file,FileName,Modes}, but it is no longer documented. Rotation scheme: The current log file always has the same name, and the archived files get extensions ".0", ".1", ... The newest archive has extension ".0", and the oldest archive has the highest number. If 'compress_on_rotate' is set to true, the archived files are gzipped and get the additional extension ".gz", e.g. error.log.0.gz. Rotation is turned off by setting 'max_no_bytes' to infinity. Setting 'max_no_files' to 0 does not turn off rotation, but only specifies that no archives are to be saved.
2019-03-08ssl: Correct active once emulationIngela Anderton Andin
Conflicts: lib/ftp/test/ftp_SUITE.erl
2019-03-08ftp: New test caseIngela Anderton Andin
2019-03-07Merge branch 'sverker/maint/ets-no-mbuf-trapping/OTP-15660'Sverker Eriksson
into sverker/master/ets-no-mbuf-trapping/OTP-15660
2019-03-07Merge branch 'sverker/ets-no-mbuf-trapping/OTP-15660'Sverker Eriksson
into sverker/maint/ets-no-mbuf-trapping/OTP-15660
2019-03-07erts: Remove ets traversal yielding if heap fragmentSverker Eriksson
Many heap fragments do no longer make the GC slow. Even worse, we are not guaranteed that a yield will provoke a GC removing the fragments, which might lead to a one-yield-per-bucket scenario if the heap fragment(s) still remains after each yield.
2019-03-07Better erl_interface deprecation warning implementationRickard Green
2019-03-07Merge branch 'maint'Rickard Green
* maint:
2019-03-07Merge branch 'rickard/make-fixes-21/OTP-15657' into maintRickard Green
* rickard/make-fixes-21/OTP-15657: Remove own configured RM make variable
2019-03-07Merge branch 'rickard/make-fixes-22/OTP-15657'Rickard Green
* rickard/make-fixes-22/OTP-15657: Remove own configured RM make variable
2019-03-07Merge branch 'maint'Siri Hansen
2019-03-07Merge branch 'siri/logger/optimize-formatter/OTP-15647' into maintSiri Hansen
* siri/logger/optimize-formatter/OTP-15647: [logger] Improve formatter performance
2019-03-07[logger] Improve formatter performanceSiri Hansen
2019-03-07Merge branch 'maint'Siri Hansen
2019-03-07Merge branch 'siri/logger/bench' into maintSiri Hansen
* siri/logger/bench: [logger] Add benchmark of big log events with chars_limit and max_size [logger] Add max memory usage to statistics in logger_olp Skip logger benchmarks in normal kernel test [logger] Add benchmark of events per millisecond for handlers
2019-03-07[logger] Add benchmark of big log events with chars_limit and max_sizeSiri Hansen
2019-03-07[logger] Add max memory usage to statistics in logger_olpSiri Hansen
2019-03-07Skip logger benchmarks in normal kernel testSiri Hansen
2019-03-07[logger] Add benchmark of events per millisecond for handlersSiri Hansen
2019-03-07Slightly optimize binary constructionBjörn Gustavsson
Use S operands instead of s operands for a slight speed increase and reduction in code size of process_main(). Use micro instructions for frequently executed instructions. While at it, use safe multiplication in gen_get_integer() in beam_load.c.
2019-03-07Merge branch 'maint'Ingela Anderton Andin
2019-03-07Merge branch 'ingela/ftp/chunk-timing/ERIERL-316/OTP-15659' into maintIngela Anderton Andin
* ingela/ftp/chunk-timing/ERIERL-316/OTP-15659: ftp: Correct test case ftp: Fix timing bug
2019-03-07ftp: Correct test caseIngela Anderton Andin
Test case can not make assumptions on how many chunks will delivered from the underlaying TCP stream. Some code commented out that should be used in some form to create a new test case. There might be other issues than the one fixed in the previous commit.
2019-03-07erts: Add enif_term_typeJohn Högberg
This helps avoid long sequences of enif_is_xxx in code that serializes terms (such as JSON encoders) by letting the user switch on the type.
2019-03-06Merge branch 'rickard/send-bump-reds/ERL-773/OTP-15513'Rickard Green
* rickard/send-bump-reds/ERL-773/OTP-15513: Fix faulty assertion Bump reductions on send based on message size
2019-03-06Merge 'rickard/make-fixes-21/OTP-15657' into 'rickard/make-fixes-22/OTP-15657'Rickard Green
* rickard/make-fixes-21/OTP-15657: Remove own configured RM make variable
2019-03-06Merge 'rickard/make-fixes-20/OTP-15657' into 'rickard/make-fixes-21/OTP-15657'Rickard Green
* rickard/make-fixes-20/OTP-15657: Remove own configured RM make variable
2019-03-06Merge 'rickard/make-fixes-19/OTP-15657' into 'rickard/make-fixes-20/OTP-15657'Rickard Green
* rickard/make-fixes-19/OTP-15657: Remove own configured RM make variable
2019-03-06Merge 'rickard/make-fixes-18/OTP-15657' into 'rickard/make-fixes-19/OTP-15657'Rickard Green
* rickard/make-fixes-18/OTP-15657: Remove own configured RM make variable