diff options
| author | Erlang/OTP <[email protected]> | 2017-06-30 15:20:46 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-06-30 15:20:46 +0200 |
| commit | 826cdb6f2d4c880fd903e9b83b355386be336ded (patch) | |
| tree | 3c7476489401a51016aea502f486ee6bf33ed98e /erts/emulator/beam/sys.h | |
| parent | 03db89c104f23f20a5b0733a219b55358b8ece70 (diff) | |
| parent | 1f1c7a90ff5bacf19f0437e6f54cfe97e2d25e97 (diff) | |
| download | otp-826cdb6f2d4c880fd903e9b83b355386be336ded.tar.gz otp-826cdb6f2d4c880fd903e9b83b355386be336ded.tar.bz2 otp-826cdb6f2d4c880fd903e9b83b355386be336ded.zip | |
Merge branch 'rickard/statistics/OTP-14484' into maint-20
* rickard/statistics/OTP-14484:
Fix statistics(wall_clock) and statistics(runtime) implementation
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index d752ea4330..b6c77794d2 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -784,10 +784,10 @@ Preload* sys_preloaded(void); unsigned char* sys_preload_begin(Preload*); void sys_preload_end(Preload*); int sys_get_key(int); -void elapsed_time_both(UWord *ms_user, UWord *ms_sys, - UWord *ms_user_diff, UWord *ms_sys_diff); -void wall_clock_elapsed_time_both(UWord *ms_total, - UWord *ms_diff); +void elapsed_time_both(ErtsMonotonicTime *ms_user, ErtsMonotonicTime *ms_sys, + ErtsMonotonicTime *ms_user_diff, ErtsMonotonicTime *ms_sys_diff); +void wall_clock_elapsed_time_both(ErtsMonotonicTime *ms_total, + ErtsMonotonicTime *ms_diff); void get_time(int *hour, int *minute, int *second); void get_date(int *year, int *month, int *day); void get_localtime(int *year, int *month, int *day, |