diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-12-29 15:48:39 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2010-12-29 15:48:39 +0100 |
| commit | b35412e5eed93875a9c8c47fc8dec3392947b986 (patch) | |
| tree | 38f9eee54ff34736cc14c4128c3fa1bfcc1e1474 /erts/emulator/sys/common/erl_mseg.c | |
| parent | 609e7ade98cb278f890e1d53a65356b4d9f12422 (diff) | |
| parent | e7a56088a38bf79a650659b5b6381f71af75c740 (diff) | |
| download | otp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.gz otp-b35412e5eed93875a9c8c47fc8dec3392947b986.tar.bz2 otp-b35412e5eed93875a9c8c47fc8dec3392947b986.zip | |
Merge branch 'egil/timer-wheel-min-time/OTP-8990' into dev
* egil/timer-wheel-min-time/OTP-8990:
Teach timer-wheel slots to use double linked lists
Remove timer-thread implementation
Refactor timer interface
Teach timer-wheel to keep min time
Diffstat (limited to 'erts/emulator/sys/common/erl_mseg.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_mseg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index b1ee165489..010d60eb63 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -35,6 +35,7 @@ #include "global.h" #include "erl_threads.h" #include "erl_mtrace.h" +#include "erl_time.h" #include "big.h" #if HAVE_ERTS_MSEG @@ -271,7 +272,7 @@ schedule_cache_check(void) #endif { cache_check_timer.active = 0; - erl_set_timer(&cache_check_timer, + erts_set_timer(&cache_check_timer, check_cache, NULL, NULL, |