diff options
| author | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
| commit | 40beec43a477062dc81c4dd29eb9dc6a1db0ee9a (patch) | |
| tree | 1695f93aed4ca1760a2b4c94f19e83d119ae3866 /erts/emulator/beam/atom.names | |
| parent | 4b17e3d6585bac8411d8f58d65d05e90156f5664 (diff) | |
| parent | 19c4689eea86f26c5af9b8f712c227ce4f62310b (diff) | |
| download | otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.gz otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.bz2 otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.zip | |
Merge branch 'rickard/ohmq-fixup/OTP-13047'
* rickard/ohmq-fixup/OTP-13047:
Replace off_heap_message_queue option with message_queue_data option
Always use literal_alloc
Distinguish between GC disabled by BIFs and other disabled GC
Fix process_info(_, off_heap_message_queue)
Off heap message queue test suite
Remove unused variable
Fix memory leaks
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index ea04495574..7424e47ec3 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -350,6 +350,7 @@ atom memory_internal atom memory_types atom message atom message_binary +atom message_queue_data atom message_queue_len atom messages atom merge_trap @@ -361,6 +362,7 @@ atom min_heap_size atom min_bin_vheap_size atom minor_version atom Minus='-' +atom mixed atom module atom module_info atom monitored_by @@ -423,11 +425,12 @@ atom notify atom notsup atom nouse_stdio atom objects -atom off_heap_message_queue +atom off_heap atom offset atom ok atom old_heap_block_size atom old_heap_size +atom on_heap atom on_load atom open atom open_error |