diff options
author | Rickard Green <[email protected]> | 2015-12-30 11:38:15 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2015-12-30 11:38:15 +0100 |
commit | 10bcaeeea71a77a0223f2989e9a99d208eae7057 (patch) | |
tree | 564984523014c7594df59399989b37d87ed82ad0 /erts/emulator/beam/beam_bp.h | |
parent | 5a22322e8448e63aa45432da90d3f01ab4cc432a (diff) | |
parent | d32ef0d4fab9b18d34b97fd7c785bcadfe292f81 (diff) | |
download | otp-10bcaeeea71a77a0223f2989e9a99d208eae7057.tar.gz otp-10bcaeeea71a77a0223f2989e9a99d208eae7057.tar.bz2 otp-10bcaeeea71a77a0223f2989e9a99d208eae7057.zip |
Merge branch 'maint'
* maint:
Use monotonic time for call_time trace
Diffstat (limited to 'erts/emulator/beam/beam_bp.h')
-rw-r--r-- | erts/emulator/beam/beam_bp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h index 97d0539ac7..2b89d6fc71 100644 --- a/erts/emulator/beam/beam_bp.h +++ b/erts/emulator/beam/beam_bp.h @@ -29,8 +29,7 @@ typedef struct { Eterm pid; Sint count; - Uint s_time; - Uint us_time; + ErtsMonotonicTime time; } bp_data_time_item_t; typedef struct { @@ -46,9 +45,7 @@ typedef struct bp_data_time { /* Call time */ } BpDataTime; typedef struct { - Uint ms; - Uint s; - Uint us; + ErtsMonotonicTime time; BeamInstr *pc; } process_breakpoint_time_t; /* used within psd */ |