diff options
| author | Rickard Green <[email protected]> | 2015-12-30 14:22:19 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-12-30 14:22:19 +0100 |
| commit | 3ea54c2dc82a2e067fbd19b201e4eb03a7dbc29d (patch) | |
| tree | 629e47d7f70ae54fa76f3d0458579897a3f103ba /erts/emulator/beam/atom.names | |
| parent | 10bcaeeea71a77a0223f2989e9a99d208eae7057 (diff) | |
| parent | df18cd270ad682cedc8c21990641b0bdb8788092 (diff) | |
| download | otp-3ea54c2dc82a2e067fbd19b201e4eb03a7dbc29d.tar.gz otp-3ea54c2dc82a2e067fbd19b201e4eb03a7dbc29d.tar.bz2 otp-3ea54c2dc82a2e067fbd19b201e4eb03a7dbc29d.zip | |
Merge branch 'maint'
* maint:
Light weight statistics of run queue lengths
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 13c2a0f8f9..ae7f405cce 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -71,6 +71,7 @@ atom absoluteURI atom ac atom accessor atom active +atom active_tasks atom all atom all_but_first atom all_names @@ -509,6 +510,7 @@ atom return_from atom return_to atom return_trace atom run_queue +atom run_queue_lengths atom runnable atom runnable_ports atom runnable_procs @@ -576,7 +578,9 @@ atom timeout_value atom Times='*' atom timestamp atom total +atom total_active_tasks atom total_heap_size +atom total_run_queue_lengths atom tpkt atom trace trace_ts traced atom trace_control_word |