diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:30:22 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:30:22 +0200 |
| commit | eedd89fcb0b892117b798b8b097cf63b9ab59db7 (patch) | |
| tree | f9dfcca0ea758fca35f6f94b98c4b013ac255103 /erts/emulator/beam/global.h | |
| parent | 620b7e879c9943e1e79990ed0a825228f7b18b04 (diff) | |
| parent | eb4d4c133a8c2ad00807888289cb99d67f70896f (diff) | |
| download | otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.gz otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.bz2 otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.zip | |
Merge branch 'pan/r16b01/system_monitor_long_schedule/OTP-11067' into maint
* pan/r16b01/system_monitor_long_schedule/OTP-11067:
Minor spelling correction
Add system_monitor of long_schedule
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index d5e727bcba..12eb3bfb7c 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -740,6 +740,8 @@ void erl_drv_thr_init(void); /* utils.c */ void erts_cleanup_offheap(ErlOffHeap *offheap); +Uint64 erts_timestamp_millis(void); + Export* erts_find_function(Eterm, Eterm, unsigned int, ErtsCodeIndex); Eterm store_external_or_ref_in_proc_(Process *, Eterm); |