Merge branch 'rickard/r16/port-optimizations/OTP-10336'

* rickard/r16/port-optimizations/OTP-10336:
  Bump reductions also for immediate driver calls
  Add 'port_count' and 'port_limit' to system_info/1 spec
  Fix documentation
  Replace use of deprecated functions in test cases
  Replace use of driver_send_term() with erl_drv_send_term()

Conflicts:
	erts/preloaded/ebin/erlang.beam

19 files changed, 104 insertions, 69 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index b069b85be5..064030ad3e 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -582,7 +582,7 @@
           <seealso marker="erts_alloc">erts_alloc(3)</seealso> for
           further information.</p>
       </item>
-      <tag><c><![CDATA[+n Behavior]]></c></tag>
+      <tag><marker id="+n"/><c><![CDATA[+n Behavior]]></c></tag>
       <item>
 	<p>Control behavior of signals to ports.</p>
 	<p>As of OTP-R16 signals to ports are truly asynchronously
@@ -615,7 +615,7 @@
 	     debugging.</item>
 	   </taglist>
       </item>
-      <tag><marker id="max_processes"><c><![CDATA[+P Number]]></c></marker></tag>
+      <tag><marker id="+P"/><marker id="max_processes"><c><![CDATA[+P Number]]></c></marker></tag>
       <item>
 	<p>Sets the maximum number of simultaneously existing processes for this
           system. Valid range for <c>Number</c> is <c>[1024-134217727]</c></p>
@@ -627,7 +627,7 @@
 	<seealso marker="erlang#system_info_process_limit">erlang:system_info(process_limit)</seealso>.</p>
 	<p>The default value is <c>262144</c></p>
       </item>
-      <tag><marker id="max_ports"><c><![CDATA[+Q Number]]></c></marker></tag>
+      <tag><marker id="+Q"/><marker id="max_ports"><c><![CDATA[+Q Number]]></c></marker></tag>
       <item>
 	<p>Sets the maximum number of simultaneously existing ports for this
           system. Valid range for <c>Number</c> is <c>[1024-134217727]</c></p>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 13f42a74a7..1212c34586 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -317,9 +317,9 @@
           minor version used by the driver is greater than the one used
           by the runtime system.</p>
 	<p>The emulator will refuse to load a driver that does not use
-	  the extended driver interface since,
+	  the extended driver interface,
 	  to allow for 64-bit capable drivers,
-	  incompatible type changes for the callbacks
+	  since incompatible type changes for the callbacks
 	  <seealso marker="driver_entry#output">output</seealso>,
 	  <seealso marker="driver_entry#control">control</seealso> and
 	  <seealso marker="driver_entry#call">call</seealso>
@@ -1560,7 +1560,7 @@ typedef struct ErlIOVec {
 	<c>[ERL_DRV_BUSY_MSGQ_LIM_MIN, ERL_DRV_BUSY_MSGQ_LIM_MAX]</c>.
 	Limits will be automatically adjusted to be sane. That is,
 	the system will	adjust values so that the low limit used is
-	lower or equal to the high limit used. By default the high
+	lower than or equal to the high limit used. By default the high
 	limit will be 8 kB and the low limit will be 4 kB.</p>
 
 	<p>By passing a pointer to an integer variable containing
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 1d67be2e52..ce59908036 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -5679,35 +5679,35 @@ ok
 	  For more information see the
 	  <seealso marker="erl#+spp">+spp</seealso> command line argument
 	  of <seealso marker="erl">erl(1)</seealso>.</p></item>
-          <tag><c>process_count</c></tag>
+          <tag><marker id="system_info_port_count"/><c>port_count</c></tag>
           <item>
             <p>Returns the number of ports currently existing at
               the local node as an integer. The same value as
-              <c>length(erlang:ports())</c> returns.</p>
+              <c>length(erlang:ports())</c> returns, but more efficient.</p>
           </item>
           <tag><marker id="system_info_port_limit"><c>port_limit</c></marker></tag>
           <item>
             <p>Returns the maximum number of simultaneously existing
               ports at the local node as an integer. This limit
               can be configured at startup by using the
-              <seealso marker="erl#max_ports"><c>+Q</c></seealso>
+              <seealso marker="erl#+Q">+Q</seealso>
 	      command line flag of
-	      <seealso marker="erl"><c>erl(1)</c></seealso>.</p>
+	      <seealso marker="erl">erl(1)</seealso>.</p>
           </item>
-          <tag><c>process_count</c></tag>
+          <tag><marker id="system_info_process_count"/><c>process_count</c></tag>
           <item>
             <p>Returns the number of processes currently existing at
               the local node as an integer. The same value as
-              <c>length(processes())</c> returns.</p>
+              <c>length(processes())</c> returns, but more efficient.</p>
           </item>
           <tag><marker id="system_info_process_limit"><c>process_limit</c></marker></tag>
           <item>
             <p>Returns the maximum number of simultaneously existing
               processes at the local node as an integer. This limit
               can be configured at startup by using the
-              <seealso marker="erl#max_processes"><c>+P</c></seealso>
+              <seealso marker="erl#+P">+P</seealso>
 	      command line flag of
-	      <seealso marker="erl"><c>erl(1)</c></seealso>.</p>
+	      <seealso marker="erl">erl(1)</seealso>.</p>
           </item>
           <tag><c>procs</c></tag>
           <item>
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index 71f232035d..4e456988a3 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -59,6 +59,8 @@ do {									\
 } while(0)
 
 #define BUMP_REDS(p, gc) do {			   \
+     ASSERT(p);		 			   \
+     ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(p));\
      (p)->fcalls -= (gc); 			   \
      if ((p)->fcalls < 0) { 			   \
 	if (!ERTS_PROC_GET_SAVED_CALLS_BUF((p)))   \
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
index fb07f3d5bc..65b4cd0bfe 100644
--- a/erts/emulator/beam/erl_port.h
+++ b/erts/emulator/beam/erl_port.h
@@ -273,29 +273,28 @@ extern erts_smp_atomic_t erts_bytes_in;		/* no bytes sent into the system */
   (ERTS_PORT_SFLGS_INVALID_LOOKUP					\
    | ERTS_PORT_SFLG_DISTRIBUTION)
 
-
 /*
  * Costs in reductions for some port operations.
  */
-#define ERTS_PORT_REDS_EXECUTE		10
-#define ERTS_PORT_REDS_FREE		100
-#define ERTS_PORT_REDS_TIMEOUT		400
-#define ERTS_PORT_REDS_INPUT		400
-#define ERTS_PORT_REDS_OUTPUT		400
-#define ERTS_PORT_REDS_EVENT		400
-#define ERTS_PORT_REDS_CMD_OUTPUTV	400
-#define ERTS_PORT_REDS_CMD_OUTPUT	400
-#define ERTS_PORT_REDS_EXIT		300
-#define ERTS_PORT_REDS_CONNECT		40
-#define ERTS_PORT_REDS_UNLINK		40
-#define ERTS_PORT_REDS_LINK		40
-#define ERTS_PORT_REDS_BADSIG		40
-#define ERTS_PORT_REDS_CONTROL		400
-#define ERTS_PORT_REDS_CALL		400
-#define ERTS_PORT_REDS_INFO		100
-#define ERTS_PORT_REDS_SET_DATA		40
-#define ERTS_PORT_REDS_GET_DATA		40
-#define ERTS_PORT_REDS_TERMINATE	200
+#define ERTS_PORT_REDS_EXECUTE		(CONTEXT_REDS/4)
+#define ERTS_PORT_REDS_FREE		(CONTEXT_REDS/400)
+#define ERTS_PORT_REDS_TIMEOUT		(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_INPUT		(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_OUTPUT		(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_EVENT		(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_CMD_OUTPUTV	(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_CMD_OUTPUT	(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_EXIT		(CONTEXT_REDS/100)
+#define ERTS_PORT_REDS_CONNECT		(CONTEXT_REDS/200)
+#define ERTS_PORT_REDS_UNLINK		(CONTEXT_REDS/200)
+#define ERTS_PORT_REDS_LINK		(CONTEXT_REDS/200)
+#define ERTS_PORT_REDS_BADSIG		(CONTEXT_REDS/200)
+#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 *);
 void erts_port_free(Port *);
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 8ceadcdb8c..09c8e760f4 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -35,6 +35,11 @@
 #include "dtrace-wrapper.h"
 #include <stdarg.h>
 
+/*
+ * ERTS_PORT_CALLBACK_VREDS: Limit the amount of callback calls we do...
+ */
+#define ERTS_PORT_CALLBACK_VREDS (CONTEXT_REDS/5)
+
 #if defined(DEBUG) && 0
 #define ERTS_HARD_DEBUG_TASK_QUEUES
 #else
@@ -1544,6 +1549,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     ErtsPortTask *execq;
     int processing_busy_q;
     int res = 0;
+    int vreds = 0;
     int reds = ERTS_PORT_REDS_EXECUTE;
     erts_aint_t io_tasks_executed = 0;
     int fpe_was_unmasked;
@@ -1688,6 +1694,9 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    break;
 	}
 
+	vreds += ERTS_PORT_CALLBACK_VREDS;
+	reds += ERTS_PORT_CALLBACK_VREDS;
+
 	if (reds >= CONTEXT_REDS)
 	    break;
     }
@@ -1757,6 +1766,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     res = (erts_smp_atomic_read_nob(&erts_port_task_outstanding_io_tasks)
 	   != (erts_aint_t) 0);
 
+    reds -= vreds;
     runq->scheduler->reductions += reds;
 
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index e466f0e299..04dc9bb236 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -1573,6 +1573,8 @@ bad_port_signal(Process *c_p,
 			try_call_state.state,
 			flags & ERTS_PORT_SIG_FLG_BAD_OUTPUT);
 	finalize_imm_drv_call(&try_call_state);
+	if (c_p)
+	    BUMP_REDS(c_p, ERTS_PORT_REDS_BADSIG);
 	return ERTS_PORT_OP_BADARG;
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 	return ERTS_PORT_OP_DROPPED;
@@ -1950,10 +1952,11 @@ erts_port_output(Process *c_p,
 		driver_free_binary(cbin);
 		if (evp != &ev)
 		    erts_free(ERTS_ALC_T_TMP, evp);
-		if (try_call_res == ERTS_TRY_IMM_DRV_CALL_OK)
-		    return ERTS_PORT_OP_DONE;
-		else
+		if (try_call_res != ERTS_TRY_IMM_DRV_CALL_OK)
 		    return ERTS_PORT_OP_DROPPED;
+		if (c_p)
+		    BUMP_REDS(c_p, ERTS_PORT_REDS_CMD_OUTPUTV);
+		return ERTS_PORT_OP_DONE;
 	    case ERTS_TRY_IMM_DRV_CALL_INVALID_SCHED_FLAGS:
 		sched_flags = try_call_state.sched_flags;
 	    case ERTS_TRY_IMM_DRV_CALL_BUSY_LOCK:
@@ -2096,10 +2099,11 @@ erts_port_output(Process *c_p,
 		/* Fall through... */
 	    case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 		erts_free(ERTS_ALC_T_TMP, buf);
-		if (try_call_res == ERTS_TRY_IMM_DRV_CALL_OK)
-		    return ERTS_PORT_OP_DONE;
-		else
+		if (try_call_res != ERTS_TRY_IMM_DRV_CALL_OK)
 		    return ERTS_PORT_OP_DROPPED;
+		if (c_p)
+		    BUMP_REDS(c_p, ERTS_PORT_REDS_CMD_OUTPUT);
+		return ERTS_PORT_OP_DONE;
 	    case ERTS_TRY_IMM_DRV_CALL_INVALID_SCHED_FLAGS:
 		sched_flags = try_call_state.sched_flags;
 	    case ERTS_TRY_IMM_DRV_CALL_BUSY_LOCK:
@@ -2267,6 +2271,8 @@ erts_port_exit(Process *c_p,
 					 reason,
 					 flags & ERTS_PORT_SIG_FLG_BROKEN_LINK);
 	    finalize_imm_drv_call(&try_call_state);
+	    if (res == ERTS_PORT_OP_DONE && c_p)
+		BUMP_REDS(c_p, ERTS_PORT_REDS_EXIT);
 	    return res;
 	}
 	case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
@@ -2434,6 +2440,8 @@ erts_port_connect(Process *c_p,
 				 try_call_state.state,
 				 connect_id);
 	finalize_imm_drv_call(&try_call_state);
+	if (res == ERTS_PORT_OP_DONE)
+	    BUMP_REDS(c_p, ERTS_PORT_REDS_CONNECT);
 	return res;
     }
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
@@ -2492,6 +2500,7 @@ erts_port_unlink(Process *c_p, Port *prt, Eterm from, Eterm *refp)
     case ERTS_TRY_IMM_DRV_CALL_OK:
 	port_unlink(prt, from);
 	finalize_imm_drv_call(&try_call_state);
+	BUMP_REDS(c_p, ERTS_PORT_REDS_UNLINK);
 	return ERTS_PORT_OP_DONE;
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 	return ERTS_PORT_OP_DROPPED;
@@ -2579,6 +2588,7 @@ erts_port_link(Process *c_p, Port *prt, Eterm to, Eterm *refp)
     case ERTS_TRY_IMM_DRV_CALL_OK:
 	port_link(prt, try_call_state.state, to);
 	finalize_imm_drv_call(&try_call_state);
+	BUMP_REDS(c_p, ERTS_PORT_REDS_LINK);
 	return ERTS_PORT_OP_DONE;
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 	return ERTS_PORT_OP_BADARG;
@@ -3944,6 +3954,7 @@ erts_port_control(Process* c_p,
 						 &hp,
 						 NULL,
 						 &c_p->off_heap);
+	    BUMP_REDS(c_p, ERTS_PORT_REDS_CONTROL);
 	    return ERTS_PORT_OP_DONE;
 	}
 	case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
@@ -4244,6 +4255,7 @@ erts_port_call(Process* c_p,
 	    if (resp_buf != &resp_buf[0]
 		&& !(ret_flags & DRIVER_CALL_KEEP_BUFFER))
 		driver_free(resp_buf);
+	    BUMP_REDS(c_p, ERTS_PORT_REDS_CALL);
 	    return ERTS_PORT_OP_DONE;
 	}
 	case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
@@ -4423,6 +4435,7 @@ erts_port_info(Process* c_p,
 	    *retvalp = copy_struct(value, used_h_size, &hp, &MSO(c_p));
 	    free_message_buffer(bp);
 	}
+	BUMP_REDS(c_p, ERTS_PORT_REDS_INFO);
 	return ERTS_PORT_OP_DONE;
     }
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
@@ -4509,6 +4522,7 @@ erts_port_set_data(Process* c_p,
 	prt->bp = bp;
 	prt->data = set_data;
 	finalize_imm_drv_call(&try_call_state);
+	BUMP_REDS(c_p, ERTS_PORT_REDS_SET_DATA);
 	return ERTS_PORT_OP_DONE;
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 	return ERTS_PORT_OP_DROPPED;
@@ -4641,6 +4655,7 @@ erts_port_get_data(Process* c_p,
 	    free_message_buffer(bp);
 	}
 	*retvalp = TUPLE2(hp, am_ok, data);
+	BUMP_REDS(c_p, ERTS_PORT_REDS_GET_DATA);
 	return ERTS_PORT_OP_DONE;
     }
     case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
diff --git a/erts/emulator/test/alloc_SUITE_data/testcase_driver.c b/erts/emulator/test/alloc_SUITE_data/testcase_driver.c
index 66971654a2..5c4b11454f 100644
--- a/erts/emulator/test/alloc_SUITE_data/testcase_driver.c
+++ b/erts/emulator/test/alloc_SUITE_data/testcase_driver.c
@@ -42,6 +42,7 @@
 typedef struct {
     TestCaseState_t visible;
     ErlDrvPort port;
+    ErlDrvTermData  port_id;
     int result;
     jmp_buf done_jmp_buf;
     char *comment;
@@ -97,6 +98,7 @@ testcase_drv_start(ErlDrvPort port, char *command)
     itcs->visible.testcase_name = testcase_name();
     itcs->visible.extra = NULL;
     itcs->port = port;
+    itcs->port_id = driver_mk_port(port);
     itcs->result = TESTCASE_FAILED;
     itcs->comment = "";
 
@@ -142,7 +144,7 @@ testcase_drv_run(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
     msg[1] = (ErlDrvTermData) result_atom;
 
     msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
+    msg[3] = itcs->port_id;
 
     msg[4] = ERL_DRV_ATOM;
     msg[5] = driver_mk_atom(itcs->visible.testcase_name);
@@ -154,7 +156,7 @@ testcase_drv_run(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
     msg[9] = ERL_DRV_TUPLE;
     msg[10] = (ErlDrvTermData) 4;
 
-    driver_output_term(itcs->port, msg, 11);
+    erl_drv_output_term(itcs->port_id, msg, 11);
 }
 
 int
@@ -184,7 +186,7 @@ testcase_printf(TestCaseState_t *tcs, char *frmt, ...)
     msg[1] = (ErlDrvTermData) driver_mk_atom("print");
 
     msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
+    msg[3] = itcs->port_id;
 
     msg[4] = ERL_DRV_ATOM;
     msg[5] = driver_mk_atom(itcs->visible.testcase_name);
@@ -196,7 +198,7 @@ testcase_printf(TestCaseState_t *tcs, char *frmt, ...)
     msg[9] = ERL_DRV_TUPLE;
     msg[10] = (ErlDrvTermData) 4;
 
-    driver_output_term(itcs->port, msg, 11);
+    erl_drv_output_term(itcs->port_id, msg, 11);
 }
 
 
diff --git a/erts/emulator/test/busy_port_SUITE_data/hs_busy_drv.c b/erts/emulator/test/busy_port_SUITE_data/hs_busy_drv.c
index 9f6bd310c6..dcbaf500b8 100644
--- a/erts/emulator/test/busy_port_SUITE_data/hs_busy_drv.c
+++ b/erts/emulator/test/busy_port_SUITE_data/hs_busy_drv.c
@@ -71,9 +71,9 @@ void output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
 	ERL_DRV_PID,	driver_caller(port),
 	ERL_DRV_TUPLE,	(ErlDrvTermData) 3
     };
-    res = driver_output_term(port, msg, sizeof(msg)/sizeof(ErlDrvTermData));
+    res = erl_drv_output_term(driver_mk_port(port), msg, sizeof(msg)/sizeof(ErlDrvTermData));
     if (res <= 0)
-	driver_failure_atom(port, "driver_output_term failed");
+	driver_failure_atom(port, "erl_drv_output_term failed");
 }
 
 ErlDrvSSizeT control(ErlDrvData drv_data, unsigned int command, char *buf,
diff --git a/erts/emulator/test/driver_SUITE_data/async_blast_drv.c b/erts/emulator/test/driver_SUITE_data/async_blast_drv.c
index c2086c5860..d72b20d143 100644
--- a/erts/emulator/test/driver_SUITE_data/async_blast_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/async_blast_drv.c
@@ -56,6 +56,7 @@ static ErlDrvEntry async_blast_drv_entry = {
 
 typedef struct {
     ErlDrvPort port;
+    ErlDrvTermData port_id;
     ErlDrvTermData caller;    
     int counter;
 } async_blast_data_t;
@@ -81,6 +82,7 @@ static ErlDrvData start(ErlDrvPort port,
 	return ERL_DRV_ERROR_GENERAL;
 
     abd->port = port;
+    abd->port_id = driver_mk_port(port);
     abd->counter = 0;
     return (ErlDrvData) abd;
 }
@@ -97,12 +99,12 @@ static void ready_async(ErlDrvData drv_data,
     async_blast_data_t *abd = (async_blast_data_t *) drv_data;
     if (--abd->counter == 0) {
 	ErlDrvTermData spec[] = {
-	    ERL_DRV_PORT, driver_mk_port(abd->port),
+	    ERL_DRV_PORT, abd->port_id,
 	    ERL_DRV_ATOM, driver_mk_atom("done"),
 	    ERL_DRV_TUPLE, 2
 	};
-	driver_send_term(abd->port, abd->caller,
-			 spec, sizeof(spec)/sizeof(spec[0]));
+	erl_drv_send_term(abd->port_id, abd->caller,
+			  spec, sizeof(spec)/sizeof(spec[0]));
     }
 }
 
diff --git a/erts/emulator/test/driver_SUITE_data/caller_drv.c b/erts/emulator/test/driver_SUITE_data/caller_drv.c
index 1ed20b0638..2731f9b317 100644
--- a/erts/emulator/test/driver_SUITE_data/caller_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/caller_drv.c
@@ -85,9 +85,9 @@ send_caller(ErlDrvData drv_data, char *func)
 	ERL_DRV_PID,	driver_caller(port),
 	ERL_DRV_TUPLE,	(ErlDrvTermData) 4
     };
-    res = driver_output_term(port, msg, sizeof(msg)/sizeof(ErlDrvTermData));
+    res = erl_drv_output_term(driver_mk_port(port), msg, sizeof(msg)/sizeof(ErlDrvTermData));
     if (res <= 0)
-	driver_failure_atom(port, "driver_output_term failed");
+	driver_failure_atom(port, "erl_drv_output_term failed");
 }
 
 static ErlDrvData
diff --git a/erts/emulator/test/driver_SUITE_data/monitor_drv.c b/erts/emulator/test/driver_SUITE_data/monitor_drv.c
index 3da067fd09..81dfb65191 100644
--- a/erts/emulator/test/driver_SUITE_data/monitor_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/monitor_drv.c
@@ -117,7 +117,7 @@ static void handle_monitor(ErlDrvData drv_data, ErlDrvMonitor *monitor)
 	    o->next = p->next;
 	}
 	driver_free(p);
-	driver_send_term(data->port, data->ipid, spec, sizeof(spec)/sizeof(ErlDrvTermData));
+	erl_drv_send_term(driver_mk_port(data->port), data->ipid, spec, sizeof(spec)/sizeof(ErlDrvTermData));
     }
     
     return;
diff --git a/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c b/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c
index 221fd0ce51..93ef767d75 100644
--- a/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/otp_9302_drv.c
@@ -134,8 +134,8 @@ static void send_reply(Otp9302AsyncData *adata)
 	ERL_DRV_ATOM, adata->term_data.msg,
 	ERL_DRV_TUPLE, 2
     };
-    driver_send_term(adata->port, adata->term_data.receiver,
-		     spec, sizeof(spec)/sizeof(spec[0]));
+    erl_drv_send_term(adata->term_data.port, adata->term_data.receiver,
+		      spec, sizeof(spec)/sizeof(spec[0]));
 }
 
 static void enqueue_reply(Otp9302AsyncData *adata)
diff --git a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
index 0c86a26604..cbee1c3dce 100644
--- a/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/peek_non_existing_queue_drv.c
@@ -177,15 +177,16 @@ static void ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data)
 {
     PeekNonXQDrvData *dp = (PeekNonXQDrvData *) drv_data;
     if (dp->cmd == PEEK_NONXQ_WAIT) {
+	ErlDrvTermData port_id = driver_mk_port(dp->port);
 	ErlDrvTermData spec[] = {
-	    ERL_DRV_PORT, driver_mk_port(dp->port),
+	    ERL_DRV_PORT, port_id,
 	    ERL_DRV_ATOM, driver_mk_atom("test_successful"),
 	    ERL_DRV_TUPLE, 2
 	};
-	driver_send_term(dp->port,
-			 dp->caller,
-			 spec,
-			 sizeof(spec) / sizeof(spec[0]));
+	erl_drv_send_term(port_id,
+			  dp->caller,
+			  spec,
+			  sizeof(spec) / sizeof(spec[0]));
     }
     if (thread_data)
 	driver_free(thread_data);
diff --git a/erts/emulator/test/driver_SUITE_data/thr_msg_blast_drv.c b/erts/emulator/test/driver_SUITE_data/thr_msg_blast_drv.c
index 1070678d7b..5a9112afa3 100644
--- a/erts/emulator/test/driver_SUITE_data/thr_msg_blast_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/thr_msg_blast_drv.c
@@ -168,8 +168,8 @@ static void *thread(void *varg)
 
     for (s = 0; s < THR_MSG_BLAST_NO_SENDS_PER_PROC; s++) {
 	for (p = 0; p < THR_MSG_BLAST_NO_PROCS; p++) {
-	    int res = driver_send_term(tmbd->port, tmbd->proc[p],
-				       spec, sizeof(spec)/sizeof(spec[0]));
+	    int res = erl_drv_send_term(tmbd->td_port, tmbd->proc[p],
+					spec, sizeof(spec)/sizeof(spec[0]));
 	    if (p == 0 && res <= 0)
 		abort(); /* Could not send to creator */
 	}
diff --git a/erts/emulator/test/erl_drv_thread_SUITE_data/testcase_driver.c b/erts/emulator/test/erl_drv_thread_SUITE_data/testcase_driver.c
index b4542f3e36..2cd3209231 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE_data/testcase_driver.c
+++ b/erts/emulator/test/erl_drv_thread_SUITE_data/testcase_driver.c
@@ -42,6 +42,7 @@
 typedef struct {
     TestCaseState_t visible;
     ErlDrvPort port;
+    ErlDrvTermData port_id;
     int result;
     jmp_buf done_jmp_buf;
     char *comment;
@@ -98,6 +99,7 @@ testcase_drv_start(ErlDrvPort port, char *command)
     itcs->visible.testcase_name = testcase_name();
     itcs->visible.extra = NULL;
     itcs->port = port;
+    itcs->port_id = driver_mk_port(port);
     itcs->result = TESTCASE_FAILED;
     itcs->comment = "";
 
@@ -143,7 +145,7 @@ testcase_drv_run(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
     msg[1] = (ErlDrvTermData) result_atom;
 
     msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
+    msg[3] = itcs->port_id;
 
     msg[4] = ERL_DRV_ATOM;
     msg[5] = driver_mk_atom(itcs->visible.testcase_name);
@@ -155,7 +157,7 @@ testcase_drv_run(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
     msg[9] = ERL_DRV_TUPLE;
     msg[10] = (ErlDrvTermData) 4;
 
-    driver_output_term(itcs->port, msg, 11);
+    erl_drv_output_term(itcs->port_id, msg, 11);
 }
 
 int
@@ -185,7 +187,7 @@ testcase_printf(TestCaseState_t *tcs, char *frmt, ...)
     msg[1] = (ErlDrvTermData) driver_mk_atom("print");
 
     msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
+    msg[3] = itcs->port_id;
 
     msg[4] = ERL_DRV_ATOM;
     msg[5] = driver_mk_atom(itcs->visible.testcase_name);
@@ -197,7 +199,7 @@ testcase_printf(TestCaseState_t *tcs, char *frmt, ...)
     msg[9] = ERL_DRV_TUPLE;
     msg[10] = (ErlDrvTermData) 4;
 
-    driver_output_term(itcs->port, msg, 11);
+    erl_drv_output_term(itcs->port_id, msg, 11);
 }
 
 
diff --git a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
index b3feca79f0..f8613487b0 100644
--- a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
+++ b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
@@ -664,7 +664,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, ErlDrvSizeT count)
 
 	    /* Signal end of test case */
 	    msg[0] = ERL_DRV_NIL;
-	    driver_output_term(erlang_port, msg, 1);
+	    erl_drv_output_term(driver_mk_port(erlang_port), msg, 1);
 	    return;
 	}
 	break;
@@ -687,14 +687,14 @@ static void send_term_drv_run(ErlDrvData port, char *buf, ErlDrvSizeT count)
 
 static void output_term(ErlDrvTermData* msg, int len)
 {
-    if (driver_output_term(erlang_port, msg, len) <= 0) {
-	driver_failure_atom(erlang_port, "driver_output_term_failed");
+    if (erl_drv_output_term(driver_mk_port(erlang_port), msg, len) <= 0) {
+	driver_failure_atom(erlang_port, "erl_drv_output_term_failed");
     }
 }
 
 static void fail_term(ErlDrvTermData* msg, int len, int line)
 {
-    int status = driver_output_term(erlang_port, msg, len);
+    int status = erl_drv_output_term(driver_mk_port(erlang_port), msg, len);
 
     if (status == 1) {
 	char buf[1024];
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index bea586b11c..af7adc2d44 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 061db72dd8..e966ac5296 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2057,6 +2057,8 @@ tuple_to_list(_Tuple) ->
          (multi_scheduling) -> disabled | blocked | enabled;
          (multi_scheduling_blockers) -> [PID :: pid()];
          (otp_release) -> string();
+         (port_count) -> non_neg_integer();
+         (port_limit) -> pos_integer();
          (process_count) -> pos_integer();
          (process_limit) -> pos_integer();
          (procs) -> binary();