Merge branch 'rickard/inet_db/OTP-11074' into maint

* rickard/inet_db/OTP-11074:
  Do not treat port_set_data/port_get_data as signals

Conflicts:
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/erts_internal.beam

1 files changed, 7 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
index 377aa72ed5..4095b88369 100644
--- a/erts/emulator/beam/erl_port.h
+++ b/erts/emulator/beam/erl_port.h
@@ -167,8 +167,7 @@ struct _erl_drv_port {
 #endif
     erts_atomic_t connected;	/* A connected process */
     Eterm caller;		/* Current caller. */
-    Eterm data;			/* Data associated with port. */
-    ErlHeapFragment* bp;	/* Heap fragment holding data (NULL if imm data). */
+    erts_smp_atomic_t data;	/* Data associated with port. */
     Uint bytes_in;		/* Number of bytes read */
     Uint bytes_out;		/* Number of bytes written */
 
@@ -189,6 +188,12 @@ struct _erl_drv_port {
     int reds; /* Only used while executing driver callbacks */
 };
 
+
+void erts_init_port_data(Port *);
+void erts_cleanup_port_data(Port *);
+Uint erts_port_data_size(Port *);
+ErlOffHeap *erts_port_data_offheap(Port *);
+
 #define ERTS_PORT_GET_CONNECTED(PRT) \
     ((Eterm) erts_atomic_read_nob(&(PRT)->connected))
 #define ERTS_PORT_SET_CONNECTED(PRT, PID) \
@@ -326,8 +331,6 @@ extern erts_smp_atomic_t erts_bytes_in;		/* no bytes sent into the system */
 #define ERTS_PORT_REDS_CONTROL		(CONTEXT_REDS/100)
 #define ERTS_PORT_REDS_CALL		(CONTEXT_REDS/50)
 #define ERTS_PORT_REDS_INFO		(CONTEXT_REDS/100)
-#define ERTS_PORT_REDS_SET_DATA		(CONTEXT_REDS/100)
-#define ERTS_PORT_REDS_GET_DATA		(CONTEXT_REDS/100)
 #define ERTS_PORT_REDS_TERMINATE	(CONTEXT_REDS/50)
 
 void print_port_info(Port *, int, void *);
@@ -794,8 +797,6 @@ struct binary;
 #define ERTS_P2P_SIG_TYPE_INFO			7
 #define ERTS_P2P_SIG_TYPE_LINK			8
 #define ERTS_P2P_SIG_TYPE_UNLINK		9
-#define ERTS_P2P_SIG_TYPE_SET_DATA		10
-#define ERTS_P2P_SIG_TYPE_GET_DATA		11
 
 #define ERTS_P2P_SIG_TYPE_BITS			4
 #define ERTS_P2P_SIG_TYPE_MASK \
@@ -856,10 +857,6 @@ struct ErtsProc2PortSigData_ {
 	struct {
 	    Eterm from;
 	} unlink;
-	struct {
-	    ErlHeapFragment *bp;
-	    Eterm data;
-	} set_data;
     } u;
 } ;
 
@@ -953,7 +950,5 @@ ErtsPortOpResult erts_port_unlink(Process *, Port *, Eterm, Eterm *);
 ErtsPortOpResult erts_port_control(Process *, Port *, unsigned int, Eterm, Eterm *);
 ErtsPortOpResult erts_port_call(Process *, Port *, unsigned int, Eterm, Eterm *);
 ErtsPortOpResult erts_port_info(Process *, Port *, Eterm, Eterm *);
-ErtsPortOpResult erts_port_set_data(Process *, Port *, Eterm, Eterm *);
-ErtsPortOpResult erts_port_get_data(Process *, Port *, Eterm *);
 
 #endif