summaryrefslogtreecommitdiff
path: root/erts
Commit message (Collapse)AuthorAgeFilesLines
* erlc: Fix compiler server args on windowsDan Gudmundsson2023-05-081-1/+3
| | | | String could be wrong length if arg was quoted and changed.
* Merge branch 'maint' into masterSverker Eriksson2023-05-053-2/+31
|\ | | | | | | | | | | | | * maint: Updated OTP version Prepare release Update copyright year
| * Merge branch 'maint-25' into maintSverker Eriksson2023-05-054-3/+32
| |\ | | | | | | | | | | | | | | | | | | * maint-25: Updated OTP version Prepare release Update copyright year
| | * Prepare releaseErlang/OTP2023-05-042-1/+30
| | |
| | * Update copyright yearErlang/OTP2023-05-042-2/+2
| | |
* | | escript: Avoid warning about truncated output in strncpyFrej Drejhammar2023-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC warns about how `strncpy` is used in `erts/etc/common/escript.c`: ``` escript.c: In function ‘main’: escript.c:289:17: warning: ‘__builtin_strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation] 289 | strncpy(dir, beg, sz); | ^ In function ‘find_prog’, inlined from ‘main’ at escript.c:483:25: escript.c:282:26: note: length computed here 282 | sz = strlen(beg); ``` The warning is triggered as GCC understands that, as `sz = strlen(beg)`, `strncpy` will never see and copy a terminating nul character to `dir`. As we manually null-terminate `dir`, by `dir[sz] = '\0';` on the line following `strncpy` we can avoid the warning, and speed up the copy a little (there is no need to look for a nul terminator), by using a plain `memcpy`.
* | | Merge branch 'maint'Sverker Eriksson2023-05-021-12/+7
|\ \ \ | |/ /
| * | Merge branch 'sverker/25/erts/hashmap-collision-nodes/OTP-18569' into maintSverker Eriksson2023-05-021-12/+7
| |\ \ | | | | | | | | | | | | AGAIN
| | * \ Merge branch 'sverker/24/erts/hashmap-collision-nodes/OTP-18569'Sverker Eriksson2023-04-271-12/+7
| | |\ \ | | | | | | | | | | | | | | | into sverker/25/erts/hashmap-collision-nodes/OTP-18569
| | | * | erts: Remove dead codeSverker Eriksson2023-04-271-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging of two key-value leafs with equal keys are handled by hashmap_merge() itself, which means merge_colliding_node() will always end up with at least two distinct keys and return a collision node.
* | | | | Merge pull request #7096 from frej/frej/fix-bitwise-on-booleansRickard Green2023-05-023-3/+3
|\ \ \ \ \ | | | | | | | | | | | | erts: Fix warning about bitwise operations on booleans
| * | | | | erts: Fix warning about bitwise operations on booleansFrej Drejhammar2023-04-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Clang 16 warns when `&` and `|` are used on boolean operands.
* | | | | | Merge branch 'maint'Rickard Green2023-04-304-5/+155
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * maint: [erts] ensure no mix of external and internal identifiers
| * | | | | Merge branch 'rickard/creation-fix/25.3.1/OTP-18570' into maintRickard Green2023-04-304-5/+155
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * rickard/creation-fix/25.3.1/OTP-18570: [erts] ensure no mix of external and internal identifiers
| | * | | | Merge branch 'rickard/creation-fix/24.3.4/OTP-18570' into ↵Rickard Green2023-04-294-5/+155
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rickard/creation-fix/25.3.1/OTP-18570 * rickard/creation-fix/24.3.4/OTP-18570: [erts] ensure no mix of external and internal identifiers
| | | * \ \ \ Merge branch 'rickard/creation-fix/23.3.4/OTP-18570' into ↵Rickard Green2023-04-294-2/+154
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rickard/creation-fix/24.3.4/OTP-18570 * rickard/creation-fix/23.3.4/OTP-18570: [erts] ensure no mix of external and internal identifiers
| | | | * | | | [erts] ensure no mix of external and internal identifiersRickard Green2023-04-294-2/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silently reject proposed creation and select another one when a node goes alive if there are external identifiers in the system with the proposed creation and the same node name that are to be used. Such identifiers would not work as expected in various situations, and are not from the instance of the node that are about to go alive.
* | | | | | | | Merge branch 'bmk/erts/esock/20230414/win_async_io_continue/OTP-18029'Micael Karlberg2023-04-2812-675/+1397
|\ \ \ \ \ \ \ \
| * | | | | | | | [erts|esock] Add function for handling 'more_data' errorMicael Karlberg2023-04-261-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When, on Windows, reading with recvfrom, if the buffer is too small for the data available, the result is an error: 'more_data'. Add a function for handling this special error case. OTP-18029
| * | | | | | | | [erts|esock] Add one more (Windows) error codeMicael Karlberg2023-04-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|preloaded|esock] sendto did not handle completionMicael Karlberg2023-04-212-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] Completion statusMicael Karlberg2023-04-173-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrectly used get_overlapped_result as reason tag. Should have been completion_status. OTP-18029
| * | | | | | | | [erts|esock] Fixed eeiMicael Karlberg2023-04-174-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] Make use of new config flag (eei)Micael Karlberg2023-04-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new config flag ESOCK_USE_EXTENDED_ERROR_INFO. OTP-18029
| * | | | | | | | [erts|esock] Add config flag for 'extended error info'Micael Karlberg2023-04-143-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion recvmsg minor restructureMicael Karlberg2023-04-141-112/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion recvfrom minor restructureMicael Karlberg2023-04-141-106/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion recv minor restructureMicael Karlberg2023-04-141-117/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion sendmsg minor restructureMicael Karlberg2023-04-141-116/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion sendto minor restructureMicael Karlberg2023-04-141-113/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] ESAIO Completion send minor restructureMicael Karlberg2023-04-141-109/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
| * | | | | | | | [erts|esock] Fixed broken 'disable-esock'Micael Karlberg2023-04-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The I/O Backend files did not support this feature. OTP-18029
| * | | | | | | | [erts|esock] Tweaked warning messagesMicael Karlberg2023-04-141-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OTP-18029
* | | | | | | | | Merge branch 'maint' into masterJakub Witczak2023-04-273-2/+69
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release Update copyright year
| * | | | | | | | Merge branch 'maint-25' into maintJakub Witczak2023-04-279-8/+75
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-25: Updated OTP version Prepare release Update copyright year
| | * | | | | | | Prepare releaseErlang/OTP2023-04-252-1/+68
| | | | | | | | |
| | * | | | | | | Update copyright yearErlang/OTP2023-04-259-9/+9
| | | | | | | | |
| | * | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maint-25Erlang/OTP2023-04-254-0/+18
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/utf32/25/OTP-18560: Eliminate crash in matching of utf32 segment
| | * \ \ \ \ \ \ \ Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maint-25Erlang/OTP2023-04-251-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/no-native-atomics-fix/GH-7114/OTP-18563: [erts] Fix build without native atomics
| | * \ \ \ \ \ \ \ \ Merge branch 'rickard/mon-link-dbg-fix' into maint-25Erlang/OTP2023-04-251-6/+16
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/mon-link-dbg-fix: [erts] Fix debug functionalty for monitors/links
| | * \ \ \ \ \ \ \ \ \ Merge branch 'rickard/aliasmonitor-fix/25.3/OTP-18557' into maint-25Erlang/OTP2023-04-254-6/+57
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/aliasmonitor-fix/25.3/OTP-18557: [erts] Fix erroneous removal of alias from alias table
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maint-25Erlang/OTP2023-04-253-8/+47
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * john/erts/fix-ic-dc-config-test/OTP-18554: Update configure scripts erts: Fix ic/dc config tests and usage
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-overlapping-code-barriers-25/OTP-18553' into ↵Erlang/OTP2023-04-251-6/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-25 * john/erts/fix-overlapping-code-barriers-25/OTP-18553: erts: Fix overlapping blocking code barriers in the same tick
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maint-25Erlang/OTP2023-04-251-16/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/driver-call-callback-fix/24.3.4/OTP-18525: [erts] Fix error case for driver call callback
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' into masterSverker Eriksson2023-04-2613-497/+812
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge commit contains additional jit implementation for the hashmap collision nodes in beam/jit/x86/instr_map.cpp beam/jit/arm/instr_map.cpp
| * | | | | | | | | | | | | | | Merge branch 'sverker/25/erts/hashmap-collision-nodes' into maintSverker Eriksson2023-04-2612-450/+793
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'sverker/24/erts/hashmap-collision-nodes' into ↵Sverker Eriksson2023-04-2612-450/+793
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | sverker/25/erts/hashmap-collision-nodes
| | | * | | | | | | | | | | | | erts: Implement hashmap collision nodesSverker Eriksson2023-04-268-348/+680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict depth of hashmap tree to 8 levels. Instead of rehashing with salt, give up and put colliding keys in "collision nodes" at the bottom of the tree. Collision nodes are normal tuples of arity 2 or larger. The elements of collision nodes are key-value cons cells like the other nodes, but they are sorted in map-key order. We do linear search in them, but that's ok as they should be small and rare in practice. Why? We had some scary encounter with forever colliding term pairs in make_internal_hash(). Even though that has been fixed we will sleep better at night knowing the hashmaps may not recurse forever draining all memory of the machine.
| | | * | | | | | | | | | | | | erts: Fix/optimize macro arityvalSverker Eriksson2023-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Macro 'arityval' asserts tuple header in debug. No point calling macro '_unchecked_header_arity' which also allows map headers.
| | | * | | | | | | | | | | | | erts: Simplify map hashingJohn Högberg2023-04-264-38/+39
| | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked: 5b0cf37de9d69a63a49dac1171ad4e5f1e616cf3