diff options
| author | Patrik Nyblom <[email protected]> | 2012-03-22 19:08:07 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-03-22 19:08:07 +0100 |
| commit | 8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (patch) | |
| tree | a0a201c8b1ee29169aca97e3befa133da867d5cd /erts/emulator/beam/bif.tab | |
| parent | aa0d3a28d6f8350965d43cd13014125a63ac25d9 (diff) | |
| parent | 5957a8338fe1f4e79a39277174094bbd9e978896 (diff) | |
| download | otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.tar.gz otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.tar.bz2 otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/beam_emu.c
erts/emulator/beam/bif.tab
erts/preloaded/ebin/prim_file.beam
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 1338b90374..698bbf0098 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -814,6 +814,23 @@ bif erlang:universaltime_to_posixtime/1 bif erlang:posixtime_to_universaltime/1 # +# New in R15B01 +# + +# The dtrace BIF's are always present, but give dummy results if dynamic trace is not enabled in the build +bif erlang:dt_put_tag/1 +bif erlang:dt_get_tag/0 +bif erlang:dt_get_tag_data/0 +bif erlang:dt_spread_tag/1 +bif erlang:dt_restore_tag/1 + +# These are dummies even with enabled dynamic trace unless vm probes are enabled. +# They are also internal, for dtrace tags sent to the VM's own drivers (efile) +bif erlang:dt_prepend_vm_tag_data/1 +bif erlang:dt_append_vm_tag_data/1 + + +# # New in R16B. # bif erlang:prepare_loading/2 |