diff options
author | Erlang/OTP <[email protected]> | 2013-04-26 12:33:20 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2013-04-26 12:33:20 +0200 |
commit | bfc0387a40097414f5e1af11d01ec621296cc33f (patch) | |
tree | 3bbfb75ecf0bf3c726cf1683650bce5b71aa6940 /erts/emulator/beam/global.h | |
parent | 32b32fb6dd9e4c501c434789625e270e437960e3 (diff) | |
parent | c599f85af779db465348f0413f9ff245d741d699 (diff) | |
download | otp-bfc0387a40097414f5e1af11d01ec621296cc33f.tar.gz otp-bfc0387a40097414f5e1af11d01ec621296cc33f.tar.bz2 otp-bfc0387a40097414f5e1af11d01ec621296cc33f.zip |
Merge branch 'pan/monitor_long_schedule' into maint-r15
* pan/monitor_long_schedule:
Skip testcase on platforms w/o pipes/usleep
Add documentation for new system_monitor
Add long_schedule detection for ports and testcases
Add erlang:system_monitor(Pid,[{long_schedule,Millis}])
Diffstat (limited to 'erts/emulator/beam/global.h')
-rwxr-xr-x | erts/emulator/beam/global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 2c20e3da3b..5f41ed0dc4 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1455,12 +1455,15 @@ void erts_system_profile_setup_active_schedulers(void); /* system_monitor */ void monitor_long_gc(Process *p, Uint time); +void monitor_long_schedule_proc(Process *p, BeamInstr *in_i, BeamInstr *out_i, Uint time); +void monitor_long_schedule_port(Port *pp, ErtsPortTaskType type, Uint time); void monitor_large_heap(Process *p); void monitor_generic(Process *p, Eterm type, Eterm spec); Uint erts_trace_flag2bit(Eterm flag); int erts_trace_flags(Eterm List, Uint *pMask, Eterm *pTracer, int *pCpuTimestamp); Eterm erts_bif_trace(int bif_index, Process* p, Eterm* args, BeamInstr *I); +Uint64 erts_timestamp_millis(void); #ifdef ERTS_SMP void erts_send_pending_trace_msgs(ErtsSchedulerData *esdp); |