diff options
| author | Rickard Green <[email protected]> | 2017-01-04 18:10:26 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-17 12:23:19 +0100 |
| commit | f9459092940943876dff040ee997515b96fd5d50 (patch) | |
| tree | 075fc1e01f6cc1cd1e398b9f52a0ee0f617065e4 /erts/preloaded | |
| parent | fd1fb9070333fe5b91f4528841a4b0fe71bbf096 (diff) | |
| download | otp-f9459092940943876dff040ee997515b96fd5d50.tar.gz otp-f9459092940943876dff040ee997515b96fd5d50.tar.bz2 otp-f9459092940943876dff040ee997515b96fd5d50.zip | |
Scheduler wall time support for dirty schedulers
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 105976 -> 106168 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 359d28c0aa..0799546c60 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 99ef5c6314..86ebb4dd4b 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2333,6 +2333,10 @@ spawn_opt(_Tuple) -> SchedulerId :: pos_integer(), ActiveTime :: non_neg_integer(), TotalTime :: non_neg_integer(); + (scheduler_wall_time_all) -> [{SchedulerId, ActiveTime, TotalTime}] | undefined when + 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 @@ -4014,6 +4018,7 @@ sched_wall_time(Ref, N, undefined) -> sched_wall_time(Ref, N, Acc) -> receive {Ref, undefined} -> sched_wall_time(Ref, N-1, undefined); + {Ref, SWTL} when erlang:is_list(SWTL) -> sched_wall_time(Ref, N-1, Acc ++ SWTL); {Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc]) end. |