aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-12-09Merge branch 'lars/doc-include-path-error'Lars Thorsen
* lars/doc-include-path-error: Fix error in dtd include paths to xsltproc.
2011-12-09Merge branch 'nk/jinterface_better_buffer_alloc'Henrik Nord
* nk/jinterface_better_buffer_alloc: restore Java5 compatibility JInterface: improve OtpOutputStream buffer allocation OTP-9806
2011-12-09restore Java5 compatibilityNico Kruber
2011-12-09JInterface: improve OtpOutputStream buffer allocationNico Kruber
Previously, the buffer was increased linearly by 2048 bytes. I now propose to use an exponential increase function (similar to Javas ArrayList, e.g. always at least +50%). This significantly increases performance of e.g. doRPC for large parameters as the following comparison illustrates (shown is the buffer size after each time, the buffer has reached its limit): n n*2048 (n*3)/2+1 (n*3)/2+1 (at least +2048) 1 2,048 2,048 2,048 2 4,096 3,073 4,096 3 6,144 4,610 6,145 4 8,192 6,916 9,218 5 10,240 10,375 13,828 6 12,288 15,563 20,743 7 14,336 23,345 31,115 8 16,384 35,018 46,673 9 18,432 52,528 70,010 10 20,480 78,793 105,016 11 22,528 118,190 157,525 12 24,576 177,286 236,288 13 26,624 265,930 354,433 14 28,672 398,896 531,650 15 30,720 598,345 797,476 16 32,768 897,518 1,196,215 17 34,816 1,346,278 1,794,323 18 36,864 2,019,418 2,691,485 19 38,912 3,029,128 4,037,228 20 40,960 4,543,693 6,055,843 21 43,008 6,815,540 9,083,765 22 45,056 10,223,311 13,625,648 23 47,104 15,334,967 20,438,473 24 49,152 23,002,451 30,657,710 25 51,200 34,503,677 45,986,566 26 53,248 51,755,516 68,979,850 27 55,296 77,633,275 103,469,776 28 57,344 116,449,913 155,204,665 29 59,392 174,674,870 232,806,998 30 61,440 262,012,306 349,210,498 Actually, ArrayList uses the (n*3)/2+1 strategy. In order not to decrease performance for messages <10k, we could keep the (public) OtpOutputStream#defaultIncrement constant and let the buffer always increase by at least this much (third column). In order to create a buffer of 1MB, now only 16 array copies are needed vs. (1024*1024/2048)=512 array copies for the linear increase function. If a user sends a message of 10MB size, this is 22 vs. 5120 copies. NOTE: the meaning of the "public static final int defaultIncrement" member has changed a bit with this implementation (API compatibility?) - why was this public in the first place?
2011-12-09Merge branch 'raimo/64-bit-driver-api/OTP-9795'Björn Gustavsson
* raimo/64-bit-driver-api/OTP-9795: (22 commits) driver_SUITE.erl: Fix sys info drivers emulator test drivers: Conform to updated driver API runtime_tools's drivers: Conform to updated driver API ws's xwe_driver.c: Conform to updated driver API megaco's flex scanner: Conform to updated driver API seq_trace_SUITE_data/echo_drv.c: Conform to updated driver API erl_interface tests: Conform port_call_drv.c updated driver API erl_drv_thread_SUITE_data/testcase_driver.c: Conform to updated driver API float_SUITE_data/fp_drv.c: Conform to updated driver API port_SUITE_data/*_drv.c: Conform to updated driver API port_bif_SUITE_data/control_drv.c: Conform to updated driver API send_term_SUITE_data/send_term_drv.c: Conform to updated driver API system_profile_SUITE_data/echo_drv.c: Conform to updated driver API trace_port_SUITE_data/echo_drv.c: Conform to updated driver API Remove support for old drivers without ERL_DRV_EXTENDED_MARKER built-in drivers: Add ERL_DRV_EXTENDED_MARKER and version numbers Bump driver version to 2.0 erl_driver.h: Enlarge type on return value from call erl_driver.h: Enlarge types on driver callbacks output, control and call erl_driver.h: Enlarge types in driver output functions ... Conflicts: erts/emulator/test/driver_SUITE_data/monitor_drv.c erts/emulator/test/driver_SUITE_data/timer_drv.c
2011-12-09Merge branch 'rc/mnesia_log-no-async'Henrik Nord
* rc/mnesia_log-no-async: Use the synchronous log_terms instead of alog_terms in mnesia_log:ets2dcd() OTP-9804
2011-12-09Fix error in dtd include paths to xsltproc.Lars Thorsen
2011-12-09driver_SUITE.erl: Fix sys info driversRaimo Niskanen
2011-12-09emulator test drivers: Conform to updated driver APIRaimo Niskanen
2011-12-09runtime_tools's drivers: Conform to updated driver APIBjörn Gustavsson
2011-12-09ws's xwe_driver.c: Conform to updated driver APIBjörn Gustavsson
2011-12-09megaco's flex scanner: Conform to updated driver APIBjörn Gustavsson
2011-12-09seq_trace_SUITE_data/echo_drv.c: Conform to updated driver APIBjörn Gustavsson
2011-12-09erl_interface tests: Conform port_call_drv.c updated driver APIBjörn Gustavsson
2011-12-09erl_drv_thread_SUITE_data/testcase_driver.c: Conform to updated driver APIBjörn Gustavsson
2011-12-09float_SUITE_data/fp_drv.c: Conform to updated driver APIBjörn Gustavsson
While at it, include <string.h> to eliminate warnings.
2011-12-09port_SUITE_data/*_drv.c: Conform to updated driver APIBjörn Gustavsson
While at it, eliminate compilation warnings. Eliminate the control callback if it is not used.
2011-12-09port_bif_SUITE_data/control_drv.c: Conform to updated driver APIBjörn Gustavsson
Also include <string.h> to include a prototype for memcpy().
2011-12-09send_term_SUITE_data/send_term_drv.c: Conform to updated driver APIBjörn Gustavsson
2011-12-09system_profile_SUITE_data/echo_drv.c: Conform to updated driver APIBjörn Gustavsson
While at it, also eliminate all compiler warnings. Also remove the control callback since it is not actually used.
2011-12-09trace_port_SUITE_data/echo_drv.c: Conform to updated driver APIBjörn Gustavsson
While at it, also eliminate all compiler warnings.
2011-12-09Remove support for old drivers without ERL_DRV_EXTENDED_MARKERBjörn Gustavsson
Because of the extensive changes in the driver API (and especially the change of return types for callbacks such as 'control'), we can no longer allow drivers without version numbers.
2011-12-09built-in drivers: Add ERL_DRV_EXTENDED_MARKER and version numbersBjörn Gustavsson
2011-12-09Bump driver version to 2.0Raimo Niskanen
2011-12-09erl_driver.h: Enlarge type on return value from callRaimo Niskanen
2011-12-09Merge branch 'bmk/megaco/make_flex_drv_r15_compat'Micael Karlberg
2011-12-09erl_driver.h: Enlarge types on driver callbacks output, control and callRaimo Niskanen
2011-12-09Merge branch 'anders/diameter/suites_and_dialyzer/OTP-9781'Anders Svensson
* anders/diameter/suites_and_dialyzer/OTP-9781: Tell dialyzer not to warn about unused functions Add compiler testcases for generation and compilation to beam Fix semantic checks on AVP qualifiers Minor codegen/debug fix Deal with crypto:start() failure in TLS suite Don't assume empty sndrcvinfo in diameter_sctp
2011-12-09Merge branch 'bjorn/inviso/deprecate/OTP-9798'Björn Gustavsson
* bjorn/inviso/deprecate/OTP-9798: Deprecate the inviso application
2011-12-09Merge branch 'ia/public_key/test-maint'Ingela Anderton Andin
* ia/public_key/test-maint: Converted pk12 test suite files to pem and adjusted our framework to deal with changes to the pkits suite.
2011-12-09Converted pk12 test suite files to pem and adjusted our frameworkIngela Anderton Andin
to deal with changes to the pkits suite.
2011-12-09Merge branch 'siri/stdlib/improve-supervisor-SUITE/OTP-9797'Siri Hansen
* siri/stdlib/improve-supervisor-SUITE/OTP-9797: Change supervisor_SUITE to pure common test style
2011-12-09Merge branch 'ia/ssh/behaviour/OTP-9796'Ingela Anderton Andin
* ia/ssh/behaviour/OTP-9796: Use new directive "-callback" and prepare version and appup for release
2011-12-09Merge branch 'hb/hipe/unify_optimization/OTP-9768'Hans Bolinder
* hb/hipe/unify_optimization/OTP-9768: Optimize erl_types:t_unify()
2011-12-09Merge branch 'hb/dialyzer/dataflow_optimization/OTP-9761'Hans Bolinder
* hb/dialyzer/dataflow_optimization/OTP-9761: Optimize join_maps() in dialyzer_dataflow
2011-12-08Merge branch 'rickard/alloc-opt/OTP-7775'Rickard Green
* rickard/alloc-opt/OTP-7775: Fix erts_thr_progress_wakeup()
2011-12-08Fix erts_thr_progress_wakeup()Rickard Green
2011-12-08Merge remote-tracking branch 'origin/pan/hipe-alignment-warning'Patrik Nyblom
* origin/pan/hipe-alignment-warning: Declare hipe_mode_switch_debug extern in header
2011-12-08Merge branch 'pan/space_in_filename/OTP-9598'Patrik Nyblom
* pan/space_in_filename/OTP-9598: Teach os_SUITE:space_in_name to quote correctly on Windows
2011-12-08Merge branch 'pan/win_trace_inherit_handle/OTP-9658'Patrik Nyblom
* pan/win_trace_inherit_handle/OTP-9658: Remove compiler warnings and ancient VXWORKS code Avoid inheriting trace file handles to child processes
2011-12-08inet_res_SUITE: Improve nameserver handlingRaimo Niskanen
2011-12-08Merge branch 'lukas/bugs_and_tc_fixes'Lukas Larsson
* lukas/bugs_and_tc_fixes: Fix test_server test makefile for windows Only step pointer arity steps Link with LIBS after ETHR_LIBS Save +M<S>t data as true or false, not the number Return true/false instead of num for +M<S>t info Return correct format for info about sys_alloc Add explanatory text for tc failure OTP-9800
2011-12-08Fix test_server test makefile for windowsLukas Larsson
2011-12-08Only step pointer arity stepsLukas Larsson
Don't know why the 1 was there, it does however cause the buffer to overflow when decoding the atoms from rex. OTP-9799
2011-12-08Link with LIBS after ETHR_LIBSLukas Larsson
2011-12-08Save +M<S>t data as true or false, not the numberLukas Larsson
OTP-7775
2011-12-08Return true/false instead of num for +M<S>t infoLukas Larsson
OTP-7775
2011-12-08Return correct format for info about sys_allocLukas Larsson
OTP-7775
2011-12-08Merge branch 'ta/sendfile/OTP-9240'Lukas Larsson
* ta/sendfile/OTP-9240: Do not use async threads on DARWIN Fix cleanup when sendfile process crashes Return {error,closed} from sendfile if closed Do not use SFV_NOWAIT as it does not exist on all solaris Clarify some code comments Make solaris use sendfilev
2011-12-08Merge branch 'rickard/generic-thr-queue/OTP-9632'Rickard Green
* rickard/generic-thr-queue/OTP-9632: Give elements of lock-free queues some time to be deallocated Fix cleanup of elements in lock-free queues