diff options
| author | Rickard Green <[email protected]> | 2015-06-18 11:46:49 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-18 11:46:49 +0200 |
| commit | 2bf100436c480c030200a655c82ec12fe55cdca4 (patch) | |
| tree | ef87372c7e9e9e19cfe0a49cae3fa0c44a0a589e | |
| parent | ef3dd7ebc24c6bbc74d4b823cd057222bccbe1cf (diff) | |
| parent | a99dd7b0f7fd2f99d08527898ca7564024751748 (diff) | |
| download | otp-2bf100436c480c030200a655c82ec12fe55cdca4.tar.gz otp-2bf100436c480c030200a655c82ec12fe55cdca4.tar.bz2 otp-2bf100436c480c030200a655c82ec12fe55cdca4.zip | |
Merge branch 'rickard/time-api-doc-fix'
* rickard/time-api-doc-fix:
Minor doc fixes
| -rw-r--r-- | erts/doc/src/time_correction.xml | 2 | ||||
| -rw-r--r-- | erts/example/time_compat.erl | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/erts/doc/src/time_correction.xml b/erts/doc/src/time_correction.xml index 8af98acc19..87b8c9d8fc 100644 --- a/erts/doc/src/time_correction.xml +++ b/erts/doc/src/time_correction.xml @@ -613,6 +613,7 @@ <item><p><seealso marker="erlang#system_info_time_warp_mode"><c>erlang:system_info(time_warp_mode)</c></seealso></p></item> <item><p><seealso marker="erlang#system_info_time_correction"><c>erlang:system_info(time_correction)</c></seealso></p></item> <item><p><seealso marker="erlang#system_info_start_time"><c>erlang:system_info(start_time)</c></seealso></p></item> + <item><p><seealso marker="erlang#system_info_end_time"><c>erlang:system_info(end_time)</c></seealso></p></item> </list> <marker id="The_New_Erlang_Monotonic_Time"/> @@ -865,6 +866,7 @@ EventTag = {Time, UMI}</code> API can easily be implemented using existing primitives (except for <seealso marker="erlang#system_info_start_time"><c>erlang:system_info(start_time)</c></seealso>, + <seealso marker="erlang#system_info_end_time"><c>erlang:system_info(end_time)</c></seealso>, <seealso marker="erlang#system_info_os_monotonic_time_source"><c>erlang:system_info(os_monotonic_time_source)</c></seealso>, and <seealso marker="erlang#system_info_os_system_time_source"><c>erlang:system_info(os_system_time_source)</c></seealso>). By wrapping the API with functions that fall back on diff --git a/erts/example/time_compat.erl b/erts/example/time_compat.erl index 90b7fbcc80..b566fb939f 100644 --- a/erts/example/time_compat.erl +++ b/erts/example/time_compat.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2014. All Rights Reserved. +%% Copyright Ericsson AB 2014-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -25,9 +25,9 @@ %% versions. This way your code can automatically take advantage %% of the improvements in the API when available. This is an %% example of how to implement such an API, but it can be used -%% as is if you want to. Just add this module to your project, -%% and call the API via this module instead of calling the -%% BIFs directly. +%% as is if you want to. Just add (a preferrably renamed version of) +%% this module to your project, and call the API via this module +%% instead of calling the BIFs directly. %% -module(time_compat). @@ -241,7 +241,8 @@ system_info(Item) -> final; NotSupArg when NotSupArg == os_monotonic_time_source; NotSupArg == os_system_time_source; - NotSupArg == start_time -> + NotSupArg == start_time; + NotSupArg == end_time -> %% Cannot emulate this... erlang:error(notsup, [NotSupArg]); _ -> |