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

6 files changed, 18 insertions, 15 deletions

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 */
 	}