diff options
| author | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-24 16:56:08 +0100 |
| commit | 5345727d647ea65b7a0417c87b94cf958ef9ee13 (patch) | |
| tree | bcc1c75102741e9768c88b1481390e40e32586e7 /erts/emulator/beam/time.c | |
| parent | a11cec66e37c039d33091db056c0ae44405043ac (diff) | |
| parent | c20482023b70768bd84d25f1e34dbbc2fe09cf31 (diff) | |
| download | otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.gz otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.tar.bz2 otp-5345727d647ea65b7a0417c87b94cf958ef9ee13.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Better OS system time implementation
Documentation adjustments
Fix zero timout timers
erts_sys_hrtime() for lcnt
Better support for poor os monotonic sources
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/time.c')
| -rw-r--r-- | erts/emulator/beam/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c index 9f997e1d0b..3dfd3f79d4 100644 --- a/erts/emulator/beam/time.c +++ b/erts/emulator/beam/time.c @@ -524,6 +524,7 @@ erts_set_timer(ErlTimer *p, ErlTimeoutProc timeout, tiw->nto++; tiw->at_once.nto++; *tiw->at_once.tail = p; + tiw->at_once.tail = &p->next; p->next = NULL; p->timeout_pos = timeout_pos; timeout_time = ERTS_CLKTCKS_TO_MONOTONIC(timeout_pos); |