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

* rickard/port-optimizations/OTP-10336:
  Change annotate level for emacs-22 in cerl
  Update etp-commands
  Add documentation on communication in Erlang
  Add support for busy port message queue
  Add driver callback epilogue
  Implement true asynchronous signaling between processes and ports
  Add erl_drv_[send|output]_term
  Move busy port flag
  Use rwlock for driver list
  Optimize management of port tasks
  Improve configuration of process and port tables
  Remove R9 compatibility features
  Use ptab functionality also for ports
  Prepare for use of ptab functionality also for ports
  Atomic port state
  Generalize process table implementation
  Implement functionality for delaying thread progress from unmanaged threads

Conflicts:
	erts/doc/src/erl_driver.xml
	erts/doc/src/erlang.xml
	erts/emulator/beam/beam_bif_load.c
	erts/emulator/beam/beam_bp.c
	erts/emulator/beam/beam_emu.c
	erts/emulator/beam/bif.c
	erts/emulator/beam/copy.c
	erts/emulator/beam/erl_alloc.c
	erts/emulator/beam/erl_alloc.types
	erts/emulator/beam/erl_bif_info.c
	erts/emulator/beam/erl_bif_port.c
	erts/emulator/beam/erl_bif_trace.c
	erts/emulator/beam/erl_init.c
	erts/emulator/beam/erl_message.c
	erts/emulator/beam/erl_port_task.c
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/beam/erl_process_lock.c
	erts/emulator/beam/erl_trace.c
	erts/emulator/beam/export.h
	erts/emulator/beam/global.h
	erts/emulator/beam/io.c
	erts/emulator/sys/unix/sys.c
	erts/emulator/sys/vxworks/sys.c
	erts/emulator/test/port_SUITE.erl
	erts/etc/unix/cerl.src
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/prim_inet.beam
	erts/preloaded/src/prim_inet.erl
	lib/hipe/cerl/erl_bif_types.erl
	lib/kernel/doc/src/inet.xml
	lib/kernel/src/inet.erl

2 files changed, 180 insertions, 1 deletions

diff --git a/erts/emulator/test/driver_SUITE_data/Makefile.src b/erts/emulator/test/driver_SUITE_data/Makefile.src
index 9cc107cc66..b667dff6b6 100644
--- a/erts/emulator/test/driver_SUITE_data/Makefile.src
+++ b/erts/emulator/test/driver_SUITE_data/Makefile.src
@@ -14,7 +14,8 @@ MISC_DRVS =		outputv_drv@dll@ \
 			thr_alloc_drv@dll@ \
 			otp_9302_drv@dll@ \
 			thr_free_drv@dll@ \
-			async_blast_drv@dll@
+			async_blast_drv@dll@ \
+			thr_msg_blast_drv@dll@
 
 SYS_INFO_DRVS = 	sys_info_base_drv@dll@ \
 			sys_info_prev_drv@dll@ \
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
new file mode 100644
index 0000000000..1070678d7b
--- /dev/null
+++ b/erts/emulator/test/driver_SUITE_data/thr_msg_blast_drv.c
@@ -0,0 +1,178 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#include "erl_driver.h"
+
+#define THR_MSG_BLAST_NO_PROCS 10
+#define THR_MSG_BLAST_NO_SENDS_PER_PROC 10000
+
+#define THR_MSG_BLAST_THREADS 32
+
+static void stop(ErlDrvData drv_data);
+static ErlDrvData start(ErlDrvPort port,
+			char *command);
+static ErlDrvSSizeT control(ErlDrvData drv_data,
+			    unsigned int command,
+			    char *buf, ErlDrvSizeT len,
+			    char **rbuf, ErlDrvSizeT rlen);
+
+static ErlDrvEntry thr_msg_blast_drv_entry = { 
+    NULL /* init */,
+    start,
+    stop,
+    NULL /* output */,
+    NULL /* ready_input */,
+    NULL /* ready_output */,
+    "thr_msg_blast_drv",
+    NULL /* finish */,
+    NULL /* handle */,
+    control,
+    NULL /* timeout */,
+    NULL /* outputv */,
+    NULL /* ready_async */,
+    NULL /* flush */,
+    NULL /* call */,
+    NULL /* event */,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    ERL_DRV_FLAG_USE_PORT_LOCKING,
+    NULL /* handle2 */,
+    NULL /* handle_monitor */
+};
+
+typedef struct {
+    ErlDrvPort port;
+    ErlDrvTermData td_port;
+    ErlDrvTermData hi;
+    ErlDrvTid tid[THR_MSG_BLAST_THREADS];
+    int no_thrs;
+    ErlDrvTermData proc[THR_MSG_BLAST_NO_PROCS];
+    int no_procs;
+} thr_msg_blast_data_t;
+
+
+DRIVER_INIT(thr_msg_blast_drv)
+{
+    return &thr_msg_blast_drv_entry;
+}
+
+static void stop(ErlDrvData drv_data)
+{
+    int i;
+    thr_msg_blast_data_t *tmbd = (thr_msg_blast_data_t *) drv_data;
+    for (i = 0; i < tmbd->no_thrs; i++)
+	erl_drv_thread_join(tmbd->tid[i], NULL);
+    driver_free((void *) tmbd);
+}
+
+static ErlDrvData start(ErlDrvPort port,
+			char *command)
+{
+    thr_msg_blast_data_t *tmbd;
+
+    tmbd = driver_alloc(sizeof(thr_msg_blast_data_t));
+    if (!tmbd)
+	return ERL_DRV_ERROR_GENERAL;
+
+    tmbd->port = port;
+    tmbd->td_port = driver_mk_port(port);
+    tmbd->hi = driver_mk_atom("hi");
+    tmbd->no_thrs = 0;
+    tmbd->no_procs = 1;
+    tmbd->proc[0] = driver_caller(port);
+
+    return (ErlDrvData) tmbd;
+}
+
+static void *thread(void *);
+
+static ErlDrvSSizeT control(ErlDrvData drv_data,
+			    unsigned int command,
+			    char *buf, ErlDrvSizeT len,
+			    char **rbuf, ErlDrvSizeT rlen)
+{
+    thr_msg_blast_data_t *tmbd = (thr_msg_blast_data_t *) drv_data;
+    char *res_str = "error";
+
+    if (tmbd->no_procs >= THR_MSG_BLAST_NO_PROCS) {
+	int i;
+	for (i = 0; i < tmbd->no_thrs; i++)
+	    erl_drv_thread_join(tmbd->tid[i], NULL);
+	tmbd->no_thrs = 0;
+	res_str = "done";
+    }
+    else {
+
+	tmbd->proc[tmbd->no_procs++] = driver_caller(tmbd->port);
+
+	if (tmbd->no_procs == THR_MSG_BLAST_NO_PROCS) {
+	    for (tmbd->no_thrs = 0;
+		 tmbd->no_thrs < THR_MSG_BLAST_THREADS;
+		 tmbd->no_thrs++) {
+		int res = erl_drv_thread_create("test",
+						&tmbd->tid[tmbd->no_thrs],
+						thread,
+						tmbd,
+						NULL);
+		if (res != 0) {
+		    driver_failure_posix(tmbd->port, res);
+		    goto done;
+		}
+	    }
+	}
+
+	res_str = "receiver";
+    }
+
+ done: {
+	ErlDrvSSizeT res_len = strlen(res_str);
+	if (res_len > rlen) {
+	    char *abuf = driver_alloc(sizeof(char)*res_len);
+	    if (!abuf)
+		return 0;
+	    *rbuf = abuf;
+	}
+
+	memcpy((void *) *rbuf, (void *) res_str, res_len);
+
+	return res_len;
+    }
+}
+
+static void *thread(void *varg)
+{
+    int s, p;
+    thr_msg_blast_data_t *tmbd = (thr_msg_blast_data_t *) varg;
+    ErlDrvTermData spec[] = {
+	ERL_DRV_PORT, tmbd->td_port,
+	ERL_DRV_ATOM, tmbd->hi,
+	ERL_DRV_TUPLE, 2
+    };
+
+    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]));
+	    if (p == 0 && res <= 0)
+		abort(); /* Could not send to creator */
+	}
+    }
+    return NULL;
+}