diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-14 12:10:01 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-14 12:10:01 +0100 |
| commit | 915acc090913b9b75b56e5ba55985c9cb97400f4 (patch) | |
| tree | b0421fe945e4697dd7d1465fc8b7d19af7b8ac41 /erts/preloaded | |
| parent | 59aa3577a6ad73780e43a0d1b2521ba9d2e06817 (diff) | |
| parent | f39492e62b2724a09fac476980fb30b1ee194fbd (diff) | |
| download | otp-915acc090913b9b75b56e5ba55985c9cb97400f4.tar.gz otp-915acc090913b9b75b56e5ba55985c9cb97400f4.tar.bz2 otp-915acc090913b9b75b56e5ba55985c9cb97400f4.zip | |
Merge branch 'egil/r16/redocument-scheduler_wall_time/OTP-9858'
* egil/r16/redocument-scheduler_wall_time/OTP-9858:
Update preloaded erlang.beam
doc: Reintegrate R15B01 scheduler_wall_time doc
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 87236 -> 87216 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 9 |
2 files changed, 4 insertions, 5 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex efee885c6e..dce272c10b 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 01173ce4d6..5e451c015b 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1895,11 +1895,10 @@ spawn_opt(_Tuple) -> (runtime) -> {Total_Run_Time, Time_Since_Last_Call} when Total_Run_Time :: non_neg_integer(), Time_Since_Last_Call :: non_neg_integer(); - (scheduler_wall_time) -> [{Scheduler_Id, Scheduler_Worked_Time, Scheduler_Total_Time}] | - undefined when - Scheduler_Id :: pos_integer(), - Scheduler_Worked_Time :: non_neg_integer(), - Scheduler_Total_Time :: non_neg_integer(); + (scheduler_wall_time) -> [{SchedulerId, ActiveTime, TotalTime}] | undefined when + SchedulerId :: pos_integer(), + ActiveTime :: non_neg_integer(), + TotalTime :: non_neg_integer(); (wall_clock) -> {Total_Wallclock_Time, Wallclock_Time_Since_Last_Call} when Total_Wallclock_Time :: non_neg_integer(), |