diff options
| author | Rickard Green <[email protected]> | 2015-09-09 18:19:46 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-09-09 18:19:46 +0200 |
| commit | 962797287a5e7a93713a0ce9d60cdc92098ff772 (patch) | |
| tree | ce4bc93172d047c54c6338832bd3d492f9eb8173 /erts/emulator/beam/erl_process.c | |
| parent | ddd1acec5100f5bcc96b29f09b80edd717746edf (diff) | |
| parent | 79da6e851e98729d103979ba466d47f4fa4421b2 (diff) | |
| download | otp-962797287a5e7a93713a0ce9d60cdc92098ff772.tar.gz otp-962797287a5e7a93713a0ce9d60cdc92098ff772.tar.bz2 otp-962797287a5e7a93713a0ce9d60cdc92098ff772.zip | |
Merge branch 'maint'
* maint:
Add configure switch --disable-saved-compile-time
Fix ethread events with timeout
Improve choice of clock sources at build time
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index bad9da90ea..879b523c38 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -7875,11 +7875,16 @@ sched_thread_func(void *vesdp) ErtsThrPrgrCallbacks callbacks; ErtsSchedulerData *esdp = vesdp; Uint no = esdp->no; +#ifdef ERTS_SMP + erts_tse_t *tse; +#endif erts_sched_init_time_sup(esdp); #ifdef ERTS_SMP - ERTS_SCHED_SLEEP_INFO_IX(no - 1)->event = erts_tse_fetch(); + tse = erts_tse_fetch(); + erts_tse_prepare_timed(tse); + ERTS_SCHED_SLEEP_INFO_IX(no - 1)->event = tse; callbacks.arg = (void *) esdp->ssi; callbacks.wakeup = thr_prgr_wakeup; callbacks.prepare_wait = thr_prgr_prep_wait; |