aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/bif.c14
-rw-r--r--erts/emulator/beam/bif.tab14
-rw-r--r--erts/emulator/beam/ops.tab74
-rw-r--r--erts/preloaded/ebin/prim_file.beambin38764 -> 40672 bytes
-rw-r--r--erts/preloaded/src/prim_file.erl22
5 files changed, 62 insertions, 62 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 2adc713959..39d4582435 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -4647,7 +4647,7 @@ BIF_RETTYPE get_module_info_2(BIF_ALIST_2)
BIF_RET(ret);
}
-BIF_RETTYPE put_utag_1(BIF_ALIST_1)
+BIF_RETTYPE dt_put_tag_1(BIF_ALIST_1)
{
#ifdef USE_VM_PROBES
Eterm otag;
@@ -4675,7 +4675,7 @@ BIF_RETTYPE put_utag_1(BIF_ALIST_1)
#endif
}
-BIF_RETTYPE get_utag_0(BIF_ALIST_0)
+BIF_RETTYPE dt_get_tag_0(BIF_ALIST_0)
{
#ifdef USE_VM_PROBES
BIF_RET((DT_UTAG(BIF_P) == NIL || !(DT_UTAG_FLAGS(BIF_P) & DT_UTAG_PERMANENT)) ? am_undefined : DT_UTAG(BIF_P));
@@ -4683,7 +4683,7 @@ BIF_RETTYPE get_utag_0(BIF_ALIST_0)
BIF_RET(am_undefined);
#endif
}
-BIF_RETTYPE get_utag_data_0(BIF_ALIST_0)
+BIF_RETTYPE dt_get_tag_data_0(BIF_ALIST_0)
{
#ifdef USE_VM_PROBES
BIF_RET((DT_UTAG(BIF_P) == NIL) ? am_undefined : DT_UTAG(BIF_P));
@@ -4691,7 +4691,7 @@ BIF_RETTYPE get_utag_data_0(BIF_ALIST_0)
BIF_RET(am_undefined);
#endif
}
-BIF_RETTYPE prepend_vm_utag_data_1(BIF_ALIST_1)
+BIF_RETTYPE dt_prepend_vm_tag_data_1(BIF_ALIST_1)
{
#ifdef USE_VM_PROBES
Eterm b;
@@ -4718,7 +4718,7 @@ BIF_RETTYPE prepend_vm_utag_data_1(BIF_ALIST_1)
BIF_RET(BIF_ARG_1);
#endif
}
-BIF_RETTYPE append_vm_utag_data_1(BIF_ALIST_1)
+BIF_RETTYPE dt_append_vm_tag_data_1(BIF_ALIST_1)
{
#ifdef USE_VM_PROBES
Eterm b;
@@ -4745,7 +4745,7 @@ BIF_RETTYPE append_vm_utag_data_1(BIF_ALIST_1)
BIF_RET(BIF_ARG_1);
#endif
}
-BIF_RETTYPE spread_utag_1(BIF_ALIST_1)
+BIF_RETTYPE dt_spread_tag_1(BIF_ALIST_1)
{
#ifdef USE_VM_PROBES
Eterm ret;
@@ -4779,7 +4779,7 @@ BIF_RETTYPE spread_utag_1(BIF_ALIST_1)
BIF_RET(am_true);
#endif
}
-BIF_RETTYPE restore_utag_1(BIF_ALIST_1)
+BIF_RETTYPE dt_restore_tag_1(BIF_ALIST_1)
{
#ifdef USE_VM_PROBES
Eterm *tpl;
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 7940544156..8a85e102d1 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -820,16 +820,16 @@ bif erlang:posixtime_to_universaltime/1
#
# The dtrace BIF's are always present, but give dummy results if dynamic trace is not enabled in the build
-bif erlang:put_utag/1
-bif erlang:get_utag/0
-bif erlang:get_utag_data/0
-bif erlang:spread_utag/1
-bif erlang:restore_utag/1
+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:prepend_vm_utag_data/1
-bif erlang:append_vm_utag_data/1
+bif erlang:dt_prepend_vm_tag_data/1
+bif erlang:dt_append_vm_tag_data/1
#
# Obsolete
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index edc935e1ff..b2fc571032 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -884,86 +884,86 @@ call_ext_only u==3 u$func:erlang:hibernate/3 => i_hibernate
#
# If VM probes are not enabled, we want to short-circult calls to
-# the utag BIFs to make them as cheap as possible.
+# the dt tag BIFs to make them as cheap as possible.
#
%unless USE_VM_PROBES
-call_ext Arity u$func:erlang:get_utag/0 => \
+call_ext Arity u$func:erlang:dt_get_tag/0 => \
move a=am_undefined r
-call_ext_last Arity u$func:erlang:get_utag/0 D => \
+call_ext_last Arity u$func:erlang:dt_get_tag/0 D => \
move a=am_undefined r | deallocate D | return
-call_ext_only Arity u$func:erlang:get_utag/0 => \
+call_ext_only Arity u$func:erlang:dt_get_tag/0 => \
move a=am_undefined r | return
-move Any r | call_ext Arity u$func:erlang:put_utag/1 => \
+move Any r | call_ext Arity u$func:erlang:dt_put_tag/1 => \
move a=am_undefined r
-move Any r | call_ext_last Arity u$func:erlang:put_utag/1 D => \
+move Any r | call_ext_last Arity u$func:erlang:dt_put_tag/1 D => \
move a=am_undefined r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:put_utag/1 => \
+move Any r | call_ext_only Arity u$func:erlang:dt_put_tag/1 => \
move a=am_undefined r | return
-call_ext Arity u$func:erlang:put_utag/1 => \
+call_ext Arity u$func:erlang:dt_put_tag/1 => \
move a=am_undefined r
-call_ext_last Arity u$func:erlang:put_utag/1 D => \
+call_ext_last Arity u$func:erlang:dt_put_tag/1 D => \
move a=am_undefined r | deallocate D | return
-call_ext_only Arity u$func:erlang:put_utag/1 => \
+call_ext_only Arity u$func:erlang:dt_put_tag/1 => \
move a=am_undefined r | return
-call_ext Arity u$func:erlang:get_utag_data/0 => \
+call_ext Arity u$func:erlang:dt_get_tag_data/0 => \
move a=am_undefined r
-call_ext_last Arity u$func:erlang:get_utag_data/0 D => \
+call_ext_last Arity u$func:erlang:dt_get_tag_data/0 D => \
move a=am_undefined r | deallocate D | return
-call_ext_only Arity u$func:erlang:get_utag_data/0 => \
+call_ext_only Arity u$func:erlang:dt_get_tag_data/0 => \
move a=am_undefined r | return
-move Any r | call_ext Arity u$func:erlang:spread_utag/1 => \
+move Any r | call_ext Arity u$func:erlang:dt_spread_tag/1 => \
move a=am_true r
-move Any r | call_ext_last Arity u$func:erlang:spread_utag/1 D => \
+move Any r | call_ext_last Arity u$func:erlang:dt_spread_tag/1 D => \
move a=am_true r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:spread_utag/1 => \
+move Any r | call_ext_only Arity u$func:erlang:dt_spread_tag/1 => \
move a=am_true r | return
-call_ext Arity u$func:erlang:spread_utag/1 => \
+call_ext Arity u$func:erlang:dt_spread_tag/1 => \
move a=am_true r
-call_ext_last Arity u$func:erlang:spread_utag/1 D => \
+call_ext_last Arity u$func:erlang:dt_spread_tag/1 D => \
move a=am_true r | deallocate D | return
-call_ext_only Arity u$func:erlang:spread_utag/1 => \
+call_ext_only Arity u$func:erlang:dt_spread_tag/1 => \
move a=am_true r | return
-move Any r | call_ext Arity u$func:erlang:restore_utag/1 => \
+move Any r | call_ext Arity u$func:erlang:dt_restore_tag/1 => \
move a=am_true r
-move Any r | call_ext_last Arity u$func:erlang:restore_utag/1 D => \
+move Any r | call_ext_last Arity u$func:erlang:dt_restore_tag/1 D => \
move a=am_true r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:restore_utag/1 => \
+move Any r | call_ext_only Arity u$func:erlang:dt_restore_tag/1 => \
move a=am_true r | return
-call_ext Arity u$func:erlang:restore_utag/1 => \
+call_ext Arity u$func:erlang:dt_restore_tag/1 => \
move a=am_true r
-call_ext_last Arity u$func:erlang:restore_utag/1 D => \
+call_ext_last Arity u$func:erlang:dt_restore_tag/1 D => \
move a=am_true r | deallocate D | return
-call_ext_only Arity u$func:erlang:restore_utag/1 => \
+call_ext_only Arity u$func:erlang:dt_restore_tag/1 => \
move a=am_true r | return
-move Any r | call_ext Arity u$func:erlang:prepend_vm_utag_data/1 => \
+move Any r | call_ext Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
move Any r
-move Any r | call_ext_last Arity u$func:erlang:prepend_vm_utag_data/1 D => \
+move Any r | call_ext_last Arity u$func:erlang:dt_prepend_vm_tag_data/1 D => \
move Any r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:prepend_vm_utag_data/1 => \
+move Any r | call_ext_only Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
move Any r | return
-call_ext Arity u$func:erlang:prepend_vm_utag_data/1 =>
-call_ext_last Arity u$func:erlang:prepend_vm_utag_data/1 D => \
+call_ext Arity u$func:erlang:dt_prepend_vm_tag_data/1 =>
+call_ext_last Arity u$func:erlang:dt_prepend_vm_tag_data/1 D => \
deallocate D | return
-call_ext_only Arity u$func:erlang:prepend_vm_utag_data/1 => \
+call_ext_only Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
return
-move Any r | call_ext Arity u$func:erlang:append_vm_utag_data/1 => \
+move Any r | call_ext Arity u$func:erlang:dt_append_vm_tag_data/1 => \
move Any r
-move Any r | call_ext_last Arity u$func:erlang:append_vm_utag_data/1 D => \
+move Any r | call_ext_last Arity u$func:erlang:dt_append_vm_tag_data/1 D => \
move Any r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:append_vm_utag_data/1 => \
+move Any r | call_ext_only Arity u$func:erlang:dt_append_vm_tag_data/1 => \
move Any r | return
-call_ext Arity u$func:erlang:append_vm_utag_data/1 =>
-call_ext_last Arity u$func:erlang:append_vm_utag_data/1 D => \
+call_ext Arity u$func:erlang:dt_append_vm_tag_data/1 =>
+call_ext_last Arity u$func:erlang:dt_append_vm_tag_data/1 D => \
deallocate D | return
-call_ext_only Arity u$func:erlang:append_vm_utag_data/1 => \
+call_ext_only Arity u$func:erlang:dt_append_vm_tag_data/1 => \
return
# Can happen after one of the transformations above.
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index ea6d2cb8c6..a62a461146 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index f7861514ae..8d6ec96f33 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -268,7 +268,7 @@ advise(#file_descriptor{module = ?MODULE, data = {Port, _}},
%% Returns {error, Reason} | ok.
write(#file_descriptor{module = ?MODULE, data = {Port, _}}, Bytes) ->
- case drv_command_nt(Port, [?FILE_WRITE,erlang:prepend_vm_utag_data(Bytes)],false,undefined) of
+ case drv_command_nt(Port, [?FILE_WRITE,erlang:dt_prepend_vm_tag_data(Bytes)],false,undefined) of
{ok, _Size} ->
ok;
Error ->
@@ -283,7 +283,7 @@ pwrite(#file_descriptor{module = ?MODULE, data = {Port, _}}, L)
pwrite_int(_, [], 0, [], []) ->
ok;
pwrite_int(Port, [], N, Spec, Data) ->
- Header = list_to_binary([?FILE_PWRITEV, erlang:prepend_vm_utag_data(<<N:32>>) | reverse(Spec)]),
+ Header = list_to_binary([?FILE_PWRITEV, erlang:dt_prepend_vm_tag_data(<<N:32>>) | reverse(Spec)]),
case drv_command_nt(Port, [Header | reverse(Data)], false, undefined) of
{ok, _Size} ->
ok;
@@ -402,7 +402,7 @@ pread(#file_descriptor{module = ?MODULE, data = {Port, _}}, L)
pread_int(_, [], 0, []) ->
{ok, []};
pread_int(Port, [], N, Spec) ->
- drv_command_nt(Port, [?FILE_PREADV, erlang:prepend_vm_utag_data(<<0:32, N:32>>) | reverse(Spec)],false, undefined);
+ drv_command_nt(Port, [?FILE_PREADV, erlang:dt_prepend_vm_tag_data(<<0:32, N:32>>) | reverse(Spec)],false, undefined);
pread_int(Port, [{Offs, Size} | T], N, Spec)
when is_integer(Offs), is_integer(Size), 0 =< Size ->
if
@@ -424,7 +424,7 @@ pread(#file_descriptor{module = ?MODULE, data = {Port, _}}, Offs, Size)
-(?LARGEFILESIZE) =< Offs, Offs < ?LARGEFILESIZE,
Size < ?LARGEFILESIZE ->
case drv_command_nt(Port,
- [?FILE_PREADV, erlang:prepend_vm_utag_data(<<0:32, 1:32,
+ [?FILE_PREADV, erlang:dt_prepend_vm_tag_data(<<0:32, 1:32,
Offs:64/signed, Size:64>>)], false, undefined) of
{ok, [eof]} ->
eof;
@@ -923,7 +923,7 @@ drv_open(Driver, Portopts) ->
%% Closes a port in a safe way. Returns ok.
drv_close(Port) ->
- Save = erlang:spread_utag(false),
+ Save = erlang:dt_spread_tag(false),
try
try erlang:port_close(Port) catch error:_ -> ok end,
receive %% Ugly workaround in case the caller==owner traps exits
@@ -933,7 +933,7 @@ drv_close(Port) ->
ok
end
after
- erlang:restore_utag(Save)
+ erlang:dt_restore_tag(Save)
end.
@@ -958,8 +958,8 @@ drv_command(Port, Command, R) ->
end.
drv_command(Port, Command, Validated, R) when is_port(Port) ->
- Save = erlang:spread_utag(false),
- try erlang:port_command(Port, erlang:append_vm_utag_data(Command)) of
+ Save = erlang:dt_spread_tag(false),
+ try erlang:port_command(Port, erlang:dt_append_vm_tag_data(Command)) of
true ->
drv_get_response(Port, R)
catch
@@ -979,7 +979,7 @@ drv_command(Port, Command, Validated, R) when is_port(Port) ->
error:Reason ->
{error, Reason}
after
- erlang:restore_utag(Save)
+ erlang:dt_restore_tag(Save)
end;
drv_command({Driver, Portopts}, Command, Validated, R) ->
case drv_open(Driver, Portopts) of
@@ -991,7 +991,7 @@ drv_command({Driver, Portopts}, Command, Validated, R) ->
Error
end.
drv_command_nt(Port, Command, Validated, R) when is_port(Port) ->
- Save = erlang:spread_utag(false),
+ Save = erlang:dt_spread_tag(false),
try erlang:port_command(Port, Command) of
true ->
drv_get_response(Port, R)
@@ -1012,7 +1012,7 @@ drv_command_nt(Port, Command, Validated, R) when is_port(Port) ->
error:Reason ->
{error, Reason}
after
- erlang:restore_utag(Save)
+ erlang:dt_restore_tag(Save)
end.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:25:41 +0000