aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2015-12-30 14:22:19 +0100
committerRickard Green <[email protected]>2015-12-30 14:22:19 +0100
commit3ea54c2dc82a2e067fbd19b201e4eb03a7dbc29d (patch)
tree629e47d7f70ae54fa76f3d0458579897a3f103ba /erts/preloaded
parent10bcaeeea71a77a0223f2989e9a99d208eae7057 (diff)
parentdf18cd270ad682cedc8c21990641b0bdb8788092 (diff)
downloadotp-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/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin102012 -> 102216 bytes
-rw-r--r--erts/preloaded/src/erlang.erl10
2 files changed, 9 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 77f25653a3..68578c3a49 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 9517acd78e..d9dc9a1976 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2226,7 +2226,9 @@ setelement(_Index, _Tuple1, _Value) ->
spawn_opt(_Tuple) ->
erlang:nif_error(undefined).
--spec statistics(context_switches) -> {ContextSwitches,0} when
+-spec statistics(active_tasks) -> [ActiveTasks] when
+ ActiveTasks :: non_neg_integer();
+ (context_switches) -> {ContextSwitches,0} when
ContextSwitches :: non_neg_integer();
(exact_reductions) -> {Total_Exact_Reductions,
Exact_Reductions_Since_Last_Call} when
@@ -2243,6 +2245,8 @@ spawn_opt(_Tuple) ->
Total_Reductions :: non_neg_integer(),
Reductions_Since_Last_Call :: non_neg_integer();
(run_queue) -> non_neg_integer();
+ (run_queue_lengths) -> [RunQueueLenght] when
+ RunQueueLenght :: non_neg_integer();
(runtime) -> {Total_Run_Time, Time_Since_Last_Call} when
Total_Run_Time :: non_neg_integer(),
Time_Since_Last_Call :: non_neg_integer();
@@ -2250,6 +2254,10 @@ spawn_opt(_Tuple) ->
SchedulerId :: pos_integer(),
ActiveTime :: non_neg_integer(),
TotalTime :: non_neg_integer();
+ (total_active_tasks) -> ActiveTasks when
+ ActiveTasks :: non_neg_integer();
+ (total_run_queue_lengths) -> TotalRunQueueLenghts when
+ TotalRunQueueLenghts :: non_neg_integer();
(wall_clock) -> {Total_Wallclock_Time,
Wallclock_Time_Since_Last_Call} when
Total_Wallclock_Time :: non_neg_integer(),