diff options
| author | Rickard Green <[email protected]> | 2015-05-08 17:47:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-05-08 17:47:27 +0200 |
| commit | cc03bb892c4ecf2344234d4f7b1b49133d782f41 (patch) | |
| tree | a68976350b73526dfe37fe4ad4384226c1652782 /erts/emulator/beam/bif.tab | |
| parent | 207346e0543143bf1aea11a93bcb24de170fc0ac (diff) | |
| parent | 9c78f149517dc02457d4c59e90bc9b03d411e28c (diff) | |
| download | otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.tar.gz otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.tar.bz2 otp-cc03bb892c4ecf2344234d4f7b1b49133d782f41.zip | |
Merge branch 'rickard/timer-optimization/OTP-12650'
* rickard/timer-optimization/OTP-12650:
Optimized timer implementation
Reusable red-black tree implementation
Conflicts:
erts/emulator/beam/erl_bif_timer.c
Diffstat (limited to 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 471f687101..eadba3eaff 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -171,11 +171,6 @@ bif erts_internal:map_hashmap_children/1 bif erts_internal:time_unit/0 -bif erts_internal:get_bif_timer_servers/0 -bif erts_internal:create_bif_timer/0 -bif erts_internal:access_bif_timer/1 - -bif erts_internal:monitor_process/2 bif erts_internal:is_system_process/1 # inet_db support @@ -220,6 +215,15 @@ bif math:sqrt/1 bif math:atan2/2 bif math:pow/2 +bif erlang:start_timer/3 +bif erlang:start_timer/4 +bif erlang:send_after/3 +bif erlang:send_after/4 +bif erlang:cancel_timer/1 +bif erlang:cancel_timer/2 +bif erlang:read_timer/1 +bif erlang:read_timer/2 + bif erlang:make_tuple/2 bif erlang:append_element/2 bif erlang:make_tuple/3 |