summaryrefslogtreecommitdiff
path: root/erts/emulator/beam
Commit message (Collapse)AuthorAgeFilesLines
* Prepare releaseErlang/OTP2023-05-151-1/+1
|
* Update copyright yearErlang/OTP2023-05-155-5/+5
|
* Merge branch 'john/jit/fix-tracing-non-native-stack/OTP-18561'John Högberg2023-05-111-6/+15
|\ | | | | | | | | * john/jit/fix-tracing-non-native-stack/OTP-18561: jit: Fix tracing for non-native stack
| * jit: Fix tracing for non-native stackJohn Högberg2023-04-241-6/+15
| |
* | Merge branch 'maint' into masterSverker Eriksson2023-05-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release Update copyright year
| * \ Merge branch 'maint-25' into maintSverker Eriksson2023-05-051-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * maint-25: Updated OTP version Prepare release Update copyright year
| | * | Update copyright yearErlang/OTP2023-05-041-1/+1
| | | |
* | | | 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-303-0/+33
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * maint: [erts] ensure no mix of external and internal identifiers
| * | | | | | Merge branch 'rickard/creation-fix/25.3.1/OTP-18570' into maintRickard Green2023-04-303-0/+33
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * 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-293-0/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-293-0/+33
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-293-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'maint' into masterJakub Witczak2023-04-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release Update copyright year
| * | | | | | | | Merge branch 'maint-25' into maintJakub Witczak2023-04-275-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-25: Updated OTP version Prepare release Update copyright year
| | * | | | | | | Update copyright yearErlang/OTP2023-04-257-7/+7
| | | | | | | | |
| | * | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maint-25Erlang/OTP2023-04-253-0/+14
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-253-5/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-251-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2612-484/+755
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2611-437/+736
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'sverker/24/erts/hashmap-collision-nodes' into ↵Sverker Eriksson2023-04-2611-437/+736
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | sverker/25/erts/hashmap-collision-nodes
| | | * | | | | | | | | | | | erts: Implement hashmap collision nodesSverker Eriksson2023-04-267-335/+623
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge pull request #7155 from ↵John Högberg2023-04-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jhogberg/john/jit/fix-metadata-empty-module/GH-7151 jit: Fix metadata registration for empty modules
| * | | | | | | | | | | | | | jit: Fix metadata registration for empty modulesJohn Högberg2023-04-241-1/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'maint'Björn Gustavsson2023-04-253-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: Eliminate crash in matching of utf32 segment
| * | | | | | | | | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maintBjörn Gustavsson2023-04-253-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/utf32/25/OTP-18560: Eliminate crash in matching of utf32 segment
| | * | | | | | | | | | | | | Eliminate crash in matching of utf32 segmentBjörn Gustavsson2023-04-243-0/+14
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'maint'Rickard Green2023-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: [erts] Fix build without native atomics
| * | | | | | | | | | | | | Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maintRickard Green2023-04-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/no-native-atomics-fix/GH-7114/OTP-18563: [erts] Fix build without native atomics
| | * | | | | | | | | | | | [erts] Fix build without native atomicsRickard Green2023-04-241-0/+1
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #7136 from qzhuyan/fix-compile-lttngJohn Högberg2023-04-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | erts: avoid use 'bool' keyword when compiling with lttng
| * | | | | | | | | | | | erts: avoid use 'bool' keyword when compiling with lttngWilliam Yang2023-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename var name `bool` to `spawns_monitor`
* | | | | | | | | | | | | Merge branch 'maint'Rickard Green2023-04-241-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | * maint: [erts] Fix debug functionalty for monitors/links
| * | | | | | | | | | | Merge branch 'rickard/mon-link-dbg-fix' into maintRickard Green2023-04-241-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/mon-link-dbg-fix: [erts] Fix debug functionalty for monitors/links
| | * | | | | | | | | | [erts] Fix debug functionalty for monitors/linksRickard Green2023-04-121-6/+16
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-24' into maintJakub Witczak2023-04-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-24: Updated OTP version Prepare release Update copyright year
| | * | | | | | | | | | Update copyright yearErlang/OTP2023-04-204-4/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'rickard/aliasmonitor-fix/24.3/OTP-18557' into maint-24Erlang/OTP2023-04-203-5/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/aliasmonitor-fix/24.3/OTP-18557: [erts] Fix erroneous removal of alias from alias table