diff options
| author | Lars Thorsen <[email protected]> | 2015-04-24 09:51:50 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-05-08 12:32:15 +0200 |
| commit | 1e115b3e972bb8c23504ee75ad8fb2e202a6758a (patch) | |
| tree | bd4fd42371c80e747220ab25fc01cd09dc59b41d /lib/cosTime/src | |
| parent | 2e90dc9905de1e2817377fc2cfbd712ad8c802d0 (diff) | |
| download | otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.tar.gz otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.tar.bz2 otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.zip | |
[orber, cos*] Remove usage of erlang:now()
Diffstat (limited to 'lib/cosTime/src')
| -rw-r--r-- | lib/cosTime/src/CosTime_TimeService_impl.erl | 2 | ||||
| -rw-r--r-- | lib/cosTime/src/cosTime.erl | 5 | ||||
| -rw-r--r-- | lib/cosTime/src/cosTimeApp.hrl | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/cosTime/src/CosTime_TimeService_impl.erl b/lib/cosTime/src/CosTime_TimeService_impl.erl index bac4ae087c..f44e7ba2f4 100644 --- a/lib/cosTime/src/CosTime_TimeService_impl.erl +++ b/lib/cosTime/src/CosTime_TimeService_impl.erl @@ -166,7 +166,7 @@ new_interval(_, _, _, _) -> create_universal_time() -> %% Time is supposed to be #100 nano-secs passed. %% We add micro secs for a greater precision. - {MS,S,US} = now(), + {MS,S,US} = erlang:timestamp(), case catch calendar:datetime_to_gregorian_seconds( calendar:now_to_universal_time({MS,S,US})) of Secs when is_integer(Secs) -> diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl index f7d03650af..45f305df39 100644 --- a/lib/cosTime/src/cosTime.erl +++ b/lib/cosTime/src/cosTime.erl @@ -333,8 +333,9 @@ type_check(Obj, Mod) -> %%------------------------------------------------------------ create_name(Type) -> - {MSec, Sec, USec} = erlang:now(), - lists:concat(['oe_',node(),'_',Type,'_',MSec, '_', Sec, '_', USec]). + Time = erlang:system_time(), + Unique = erlang:unique_integer([positive]), + lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]). %%--------------- END OF MODULE ------------------------------ diff --git a/lib/cosTime/src/cosTimeApp.hrl b/lib/cosTime/src/cosTimeApp.hrl index f3082816f7..bdf0bf7278 100644 --- a/lib/cosTime/src/cosTimeApp.hrl +++ b/lib/cosTime/src/cosTimeApp.hrl @@ -41,7 +41,7 @@ -define(max_TimeT, 18446744073709551616). %% The calendar module uses year 0 as base for gregorian functions. -%% 'ABSOULTE_TIME_DIFF' is #seconfs from year 0 until 15 october 1582, 00:00. +%% 'ABSOULTE_TIME_DIFF' is #seconds from year 0 until 15 october 1582, 00:00. -define(ABSOLUTE_TIME_DIFF, 49947926400). %% As above but diff year 0 to 00:00 GMT, January 1, 1970 -define(STANDARD_TIME_DIFF, 62167219200). |