From febb7963a74930dccccd3d23ef56a54d27fd2549 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 29 Apr 2013 12:59:05 +0200
Subject: Do not treat port_set_data/port_get_data as signals

---
 erts/preloaded/ebin/erlang.beam        | Bin 93468 -> 93008 bytes
 erts/preloaded/ebin/erts_internal.beam | Bin 3612 -> 3272 bytes
 erts/preloaded/src/erlang.erl          |  20 ++++----------------
 erts/preloaded/src/erts_internal.erl   |  16 +---------------
 4 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'erts/preloaded')

diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 684659cca1..6c96be7074 100644
Binary files a/erts/preloaded/ebin/erlang.beam and b/erts/preloaded/ebin/erlang.beam differ
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 74c08fa4c9..8f48640a3b 100644
Binary files a/erts/preloaded/ebin/erts_internal.beam and b/erts/preloaded/ebin/erts_internal.beam differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 8e4a471a82..7e53bc486f 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2705,26 +2705,14 @@ port_info(Port, Item) ->
       Port :: port() | atom(),
       Data :: term().
     
-port_set_data(Port, Data) ->
-    case case erts_internal:port_set_data(Port, Data) of
-	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
-	     Res -> Res
-	 end of
-	badarg -> erlang:error(badarg, [Port, Data]);
-	Result -> Result
-    end.
+port_set_data(_Port, _Data) ->
+    erlang:nif_error(undefined).
 
 -spec erlang:port_get_data(Port) -> term() when
       Port :: port() | atom().
 
-port_get_data(Port) ->
-    case case erts_internal:port_get_data(Port) of
-	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
-	     Res -> Res
-	 end of
-	{ok, Data} -> Data;
-	Error -> erlang:error(Error, [Port])
-    end.
+port_get_data(_Port) ->
+    erlang:nif_error(undefined).
 
 %%
 %% If the emulator wants to perform a distributed command and
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index f1c83f4518..507bc3afb9 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -31,8 +31,7 @@
 -export([await_port_send_result/3]).
 
 -export([port_command/3, port_connect/2, port_close/1,
-	 port_control/3, port_call/3, port_set_data/2, port_get_data/1,
-	 port_info/1, port_info/2]).
+	 port_control/3, port_call/3, port_info/1, port_info/2]).
 
 %%
 %% Await result of send to port
@@ -86,19 +85,6 @@ port_control(_Port, _Operation, _Data) ->
 port_call(_Port, _Operation, _Data) ->
     erlang:nif_error(undefined).
 
--spec erts_internal:port_get_data(P1) -> Result when
-      P1 :: port() | atom(),
-      Result :: {ok, term()} | reference() | badarg.
-port_get_data(_P1) ->
-    erlang:nif_error(undefined).
-
--spec erts_internal:port_set_data(P1, P2) -> Result when
-      P1 :: port() | atom(),
-      P2 :: term(),
-      Result :: true | reference() | badarg.
-port_set_data(_P1, _P2) ->
-    erlang:nif_error(undefined).
-
 -type port_info_1_result_item() ::
       {registered_name, RegName :: atom()} |
       {id, Index :: non_neg_integer()} |
-- 
cgit v1.2.3