diff options
| author | Rickard Green <[email protected]> | 2014-02-24 13:27:33 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-24 13:27:33 +0100 |
| commit | 59c3f29702baaade9f8dbba5daec35b4b88df2a0 (patch) | |
| tree | 0bcb3de1d052cb749e9aaecfaceae6ae3194bc9f /erts/emulator/beam/beam_emu.c | |
| parent | e2896b5f3922b8397024aee8f541d46ba5cb0f1d (diff) | |
| parent | 3e8b423a2cb11f819f3cede7ef817f4012f18944 (diff) | |
| download | otp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.tar.gz otp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.tar.bz2 otp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.zip | |
Merge branch 'vinoski/ds2'
* vinoski/ds2:
further enhancements for dirty schedulers
allow optional whitespace in dirty scheduler erl options
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 6f295530b9..80c1265541 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1203,7 +1203,11 @@ void process_main(void) if (start_time != 0) { Sint64 diff = erts_timestamp_millis() - start_time; - if (diff > 0 && (Uint) diff > erts_system_monitor_long_schedule) { + if (diff > 0 && (Uint) diff > erts_system_monitor_long_schedule +#ifdef ERTS_DIRTY_SCHEDULERS + && !ERTS_SCHEDULER_IS_DIRTY(c_p->scheduler_data) +#endif + ) { BeamInstr *inptr = find_function_from_pc(start_time_i); BeamInstr *outptr = find_function_from_pc(c_p->i); monitor_long_schedule_proc(c_p,inptr,outptr,(Uint) diff); |