From 0fd4e39abeea3fc87b78eec8495109f9245b5ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 7 Feb 2012 19:19:27 +0100
Subject: Update dtrace for changes in R15

---
 erts/preloaded/src/prim_file.erl | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'erts/preloaded/src')

diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 5c9cad3a2c..46ce3ab1a4 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -1493,19 +1493,15 @@ to_seconds({_,_} = Datetime, universal) ->
 to_seconds({_,_} = Datetime, local) ->
     erlang:universaltime_to_posixtime(erlang:localtime_to_universaltime(Datetime)).
 
-%% TODO: Duplicate code!
 get_dtrace_utag() ->
-    case get(dtrace_utag) of
-        X when is_list(X) ->
-            X;
-        _ ->
-            ""
+    %% We cannot call dtrace:get_utag() because this is prim_file.erl.
+    %% We must reimplement it here.
+    case get('_dtrace_utag_@_@') of
+        undefined ->
+            <<>>;
+        X ->
+            X
     end.
 
-%% TODO: Measure if it's worth checking (re:run()?) for NUL byte first?
-enc_utag([0|Cs]) ->
-    enc_utag(Cs);
-enc_utag([C|Cs]) ->
-    [C|enc_utag(Cs)];
-enc_utag([]) ->
-    [0].
+enc_utag(UTag) ->
+    [UTag, 0].
-- 
cgit v1.2.3