summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-20' into maintJohn Högberg2017-07-273-17/+75
|\
| * Update release notesErlang/OTP2017-07-261-0/+34
| * Update version numbersErlang/OTP2017-07-261-1/+1
| * Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maint-20Erlang/OTP2017-07-263-3/+96
| |\
| * \ Merge branch 'john/erts/fix-tcp-send-timeout/OTP-14509/ERL-448' into maint-20Erlang/OTP2017-07-261-16/+29
| |\ \
| | * | Add a dedicated close function for TCP ports to prevent issues like ERL-430/448John Högberg2017-07-101-17/+29
| | * | Close TCP ports properly on send timeoutJohn Högberg2017-07-101-0/+1
| * | | erts: Add missing release noteSverker Eriksson2017-07-041-0/+11
* | | | Merge branch 'sverker/enif_whereis-bug/OTP-14523' into maintSverker Eriksson2017-07-252-12/+17
|\ \ \ \
| * | | | erts: Fix bug in enif_whereis_pid/portSverker Eriksson2017-07-112-12/+17
* | | | | Merge branch 'john/erts/use-lock-flags-in-lc' into maintJohn Högberg2017-07-258-247/+278
|\ \ \ \ \
| * | | | | Use erl_lock_flags in lock checkingJohn Högberg2017-07-114-204/+218
| * | | | | Add a proper type for lock optionsJohn Högberg2017-07-075-43/+60
* | | | | | Merge branch 'sverker/big-bxor-bug/ERL-450/OTP-14514' into maintSverker Eriksson2017-07-133-3/+96
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | erts: Fix bug in bxor of a big negative numberSverker Eriksson2017-07-123-3/+96
* | | | | | Fix building debug emulator on windowsJohn Högberg2017-07-111-1/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'john/erts/runtime-lcnt' into maintJohn Högberg2017-07-0673-1499/+2865
|\ \ \ \ \
| * | | | | Add an emulator test suite for lock countingJohn Högberg2017-07-062-0/+157
| * | | | | Break erts_debug:lock_counters/1 into separate BIFsJohn Högberg2017-07-063-73/+134
| * | | | | Allow toggling lock counting at runtimeJohn Högberg2017-07-0662-899/+1139
| * | | | | Move lock flags to a common headerJohn Högberg2017-07-063-1/+121
| * | | | | Enable register_SUITE for lcnt buildsJohn Högberg2017-07-061-8/+1
| * | | | | Make lock counter info independent of the locks being countedJohn Högberg2017-05-1815-895/+1690
* | | | | | Merge branch 'sverker/prealloc-race-bug/maint' into maintSverker Eriksson2017-07-061-1/+1
|\ \ \ \ \ \
| * | | | | | erts: Increase pre-allocated blocks #ifdef DEBUGSverker Eriksson2017-06-301-1/+1
* | | | | | | macOS: Fix problems loading cryptoBjörn Gustavsson2017-07-041-1/+1
* | | | | | | Merge branch 'maint-20' into maintJohn Högberg2017-07-043-2/+39
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update release notesErlang/OTP2017-06-301-0/+37
| * | | | | | Update version numbersErlang/OTP2017-06-301-1/+1
| * | | | | | Merge branch 'sverker/prealloc-race-bug/OTP-14491' into maint-20Erlang/OTP2017-06-301-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | erts: Fix bug in quick allocSverker Eriksson2017-06-301-1/+1
| * | | | | | Merge branch 'rickard/statistics/OTP-14484' into maint-20Erlang/OTP2017-06-305-35/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481' int...Erlang/OTP2017-06-304-57/+113
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'john/erts/fix-port-leak/OTP-13939/ERL-193' into maint-20Erlang/OTP2017-06-301-0/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | escript.c: remove dead codeMikael Pettersson2017-07-021-21/+0
* | | | | | | | | Merge branch 'sverker/erts/apply-badarg/ERL-432/OTP-14490' into maintSverker Eriksson2017-06-292-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | erts: Make apply throw 'badarg' if Args is not a listSverker Eriksson2017-06-272-1/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bjorn/erts/fix-gen-dest' into maintBjörn Gustavsson2017-06-281-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Eliminate potential unsafe use of general destinationBjörn Gustavsson2017-06-261-4/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'maint-19' into maintJohn Högberg2017-06-2711-93/+208
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update release notesErlang/OTP2017-06-261-0/+37
| * | | | | | | | Update version numbersErlang/OTP2017-06-261-1/+1
| * | | | | | | | Merge branch 'rickard/statistics/OTP-14484' into maint-19Erlang/OTP2017-06-265-35/+53
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Fix statistics(wall_clock) and statistics(runtime) implementationRickard Green2017-06-225-35/+53
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481' int...Erlang/OTP2017-06-264-57/+113
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | fixup! erts: Cleanup dropped port tasks correctlyLukas Larsson2017-06-141-7/+8
| | * | | | | | erts: Add tests to detect port close raceLukas Larsson2017-06-142-4/+67
| | * | | | | | erts: Cleanup dropped port tasks correctlyLukas Larsson2017-06-142-48/+40
| * | | | | | | Merge branch 'john/erts/fix-port-leak/OTP-13939/ERL-193' into maint-19Erlang/OTP2017-06-261-0/+6
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Mark socket disconnected on tcp_send_or_shutdown_errorkvakvs2017-06-141-0/+6
| | | |_|/ / / | | |/| | | |