aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-03-11 11:33:42 +0100
committerRickard Green <[email protected]>2016-03-11 11:33:42 +0100
commite6ca9a6b1352420d3cdc08970b049b02d4303a16 (patch)
tree0c45d43cef9236045e507e9b2f911ce4eed075c2 /erts/emulator/beam/atom.names
parentd369571f10ccc5ebf4548f4dbc74efe649c5e669 (diff)
parent207a569d4caf80b10a54eec2220ac672a3377f00 (diff)
downloadotp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.gz
otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.tar.bz2
otp-e6ca9a6b1352420d3cdc08970b049b02d4303a16.zip
Merge branch 'rickard/ds-sched-suspend'
* rickard/ds-sched-suspend: Improved scheduler suspend functionality
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index dca8b503bf..169b071cd7 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -125,7 +125,9 @@ atom binary_longest_suffix_trap
atom binary_to_list_continue
atom binary_to_term_trap
atom block
+atom block_normal
atom blocked
+atom blocked_normal
atom bm
atom bnot
atom bor
@@ -190,7 +192,9 @@ atom dexit
atom depth
atom dgroup_leader
atom dictionary
+atom dirty_cpu
atom dirty_cpu_schedulers_online
+atom dirty_io
atom disable_trace
atom disabled
atom display_items
@@ -305,6 +309,7 @@ atom index
atom infinity
atom info
atom info_msg
+atom init
atom initial_call
atom input
atom internal
@@ -612,6 +617,7 @@ atom use_stdio
atom used
atom utf8
atom unblock
+atom unblock_normal
atom uniq
atom unless_suspending
atom unloaded