aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-03-09 17:53:22 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-03-09 17:55:58 +0100
commitbef563618b7cb8a212ee18224c98e8868731091a (patch)
treef95804ad99561a7bab44c03f3407bbecd9bf09f5 /erts/preloaded
parent7a753338c1ae8ba5d4b815989b7edfbe1eaa6bfb (diff)
downloadotp-bef563618b7cb8a212ee18224c98e8868731091a.tar.gz
otp-bef563618b7cb8a212ee18224c98e8868731091a.tar.bz2
otp-bef563618b7cb8a212ee18224c98e8868731091a.zip
doc: Reintegrate R15B01 scheduler_wall_time doc
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erlang.erl9
1 files changed, 4 insertions, 5 deletions
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(),