Merge branch 'maint'

* maint:
  Fix crash when reporting stale driver select

4 files changed, 34 insertions, 15 deletions

diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 53cb01a8c6..f753de8f52 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -1928,18 +1928,21 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
 		break;
 	    case ERTS_PORT_TASK_INPUT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      DO_READ,
 				      1);
 		break;
 	    case ERTS_PORT_TASK_OUTPUT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      DO_WRITE,
 				      1);
 		break;
 	    case ERTS_PORT_TASK_EVENT:
 		erts_stale_drv_select(pp->common.id,
+				      ERTS_Port2ErlDrvPort(pp),
 				      ptp->u.alive.td.io.event,
 				      0,
 				      1);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index f7e4c81181..325e6658d9 100755
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -723,10 +723,10 @@ void erts_raw_port_command(Port*, byte*, Uint);
 void driver_report_exit(ErlDrvPort, int);
 LineBuf* allocate_linebuf(int);
 int async_ready(Port *, void*);
-ErtsPortNames *erts_get_port_names(Eterm);
+ErtsPortNames *erts_get_port_names(Eterm, ErlDrvPort);
 void erts_free_port_names(ErtsPortNames *);
 Uint erts_port_ioq_size(Port *pp);
-void erts_stale_drv_select(Eterm, ErlDrvEvent, int, int);
+void erts_stale_drv_select(Eterm, ErlDrvPort, ErlDrvEvent, int, int);
 
 Port *erts_get_heart_port(void);
 
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 13cff24b95..01e130bd64 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -4814,7 +4814,8 @@ int async_ready(Port *p, void* data)
 static void
 report_missing_drv_callback(Port *p, char *drv_type, char *callback)
 {
-    ErtsPortNames *pnp = erts_get_port_names(p->common.id);
+    ErtsPortNames *pnp = erts_get_port_names(p->common.id,
+					     ERTS_Port2ErlDrvPort(p));
     char *unknown = "<unknown>";
     char *drv_name = pnp->driver_name ? pnp->driver_name : unknown;
     char *prt_name = pnp->name ? pnp->name : unknown;
@@ -4829,15 +4830,25 @@ report_missing_drv_callback(Port *p, char *drv_type, char *callback)
 
 void
 erts_stale_drv_select(Eterm port,
+		      ErlDrvPort drv_port,
 		      ErlDrvEvent hndl,
 		      int mode,
 		      int deselect)
 {
     char *type;
-    ErlDrvPort drv_port = ERTS_Port2ErlDrvPort(erts_port_lookup_raw(port));
-    ErtsPortNames *pnp = erts_get_port_names(port);
+    ErtsPortNames *pnp;
     erts_dsprintf_buf_t *dsbufp;
 
+    if (drv_port == ERTS_INVALID_ERL_DRV_PORT) {
+	Port *prt = erts_port_lookup_raw(port);
+	if (prt)
+	    drv_port = ERTS_Port2ErlDrvPort(port);
+	else
+	    drv_port = ERTS_INVALID_ERL_DRV_PORT;
+    }
+
+    pnp = erts_get_port_names(port, drv_port);
+
     switch (mode) {
     case ERL_DRV_READ | ERL_DRV_WRITE:
 	type = "Input/Output";
@@ -4872,12 +4883,16 @@ erts_stale_drv_select(Eterm port,
 }
 
 ErtsPortNames *
-erts_get_port_names(Eterm id)
+erts_get_port_names(Eterm id, ErlDrvPort drv_port)
 {
-    Port *prt = erts_port_lookup_raw(id);
+    Port *prt;
     ErtsPortNames *pnp;
     ASSERT(is_nil(id) || is_internal_port(id));
 
+    prt = ERTS_ErlDrvPort2Port(drv_port);
+    if (prt == ERTS_INVALID_ERL_DRV_PORT)
+	prt = erts_port_lookup_raw(id);
+
     if (!prt) {
 	pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, sizeof(ErtsPortNames));
 	pnp->name = NULL;
@@ -4889,6 +4904,7 @@ erts_get_port_names(Eterm id)
 	size_t pnp_len = sizeof(ErtsPortNames);
 #ifndef DEBUG
 	pnp_len += 100; /* In most cases 100 characters will be enough... */
+	ASSERT(prt->common.id == id);
 #endif
 	pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, pnp_len);
 	do {
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 853dd90c34..7035dc77df 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -874,7 +874,7 @@ need2steal(ErtsDrvEventState *state, int mode)
 static void
 print_driver_name(erts_dsprintf_buf_t *dsbufp, Eterm id)
 {
-    ErtsPortNames *pnp = erts_get_port_names(id);
+    ErtsPortNames *pnp = erts_get_port_names(id, ERTS_INVALID_ERL_DRV_PORT);
     if (!pnp->name && !pnp->driver_name)
 	erts_dsprintf(dsbufp, "%s ", "<unknown>");
     else {
@@ -1357,8 +1357,8 @@ bad_fd_in_pollset(ErtsDrvEventState *state, Eterm inport,
 		      "Bad %s fd in erts_poll()! fd=%d, ",
 		      io_str, (int) state->fd);
 	if (is_nil(port)) {
-	    ErtsPortNames *ipnp = erts_get_port_names(inport);
-	    ErtsPortNames *opnp = erts_get_port_names(outport);
+	    ErtsPortNames *ipnp = erts_get_port_names(inport, ERTS_INVALID_ERL_DRV_PORT);
+	    ErtsPortNames *opnp = erts_get_port_names(outport, ERTS_INVALID_ERL_DRV_PORT);
 	    erts_dsprintf(dsbufp, "ports=%T/%T, drivers=%s/%s, names=%s/%s\n",
 			  is_nil(inport) ? am_undefined : inport,
 			  is_nil(outport) ? am_undefined : outport,
@@ -1370,7 +1370,7 @@ bad_fd_in_pollset(ErtsDrvEventState *state, Eterm inport,
 	    erts_free_port_names(opnp);
 	}
 	else {
-	    ErtsPortNames *pnp = erts_get_port_names(port);
+	    ErtsPortNames *pnp = erts_get_port_names(port, ERTS_INVALID_ERL_DRV_PORT);
 	    erts_dsprintf(dsbufp, "port=%T, driver=%s, name=%s\n",
 			  is_nil(port) ? am_undefined : port,
 			  pnp->driver_name ? pnp->driver_name : "<unknown>",
@@ -1390,7 +1390,7 @@ bad_fd_in_pollset(ErtsDrvEventState *state, Eterm inport,
 static void
 stale_drv_select(Eterm id, ErtsDrvEventState *state, int mode)
 {
-    erts_stale_drv_select(id, (ErlDrvEvent) state->fd, mode, 0);
+    erts_stale_drv_select(id, ERTS_INVALID_ERL_DRV_PORT, (ErlDrvEvent) state->fd, mode, 0);
     deselect(state, mode);
 }
 
@@ -1774,7 +1774,7 @@ static void doit_erts_check_io_debug(void *vstate, void *vcounters)
 		    err = 1;
 		}
 		else {
-		    ErtsPortNames *pnp = erts_get_port_names(id);
+		    ErtsPortNames *pnp = erts_get_port_names(id, ERTS_INVALID_ERL_DRV_PORT);
 		    erts_printf(" inport=%T inname=%s indrv=%s ",
 				id,
 				pnp->name ? pnp->name : "unknown",
@@ -1791,7 +1791,7 @@ static void doit_erts_check_io_debug(void *vstate, void *vcounters)
 		    err = 1;
 		}
 		else {
-		    ErtsPortNames *pnp = erts_get_port_names(id);
+		    ErtsPortNames *pnp = erts_get_port_names(id, ERTS_INVALID_ERL_DRV_PORT);
 		    erts_printf(" outport=%T outname=%s outdrv=%s ",
 				id,
 				pnp->name ? pnp->name : "unknown",
@@ -1827,7 +1827,7 @@ static void doit_erts_check_io_debug(void *vstate, void *vcounters)
 		err = 1;
 	    }
 	    else {
-		ErtsPortNames *pnp = erts_get_port_names(id);
+		ErtsPortNames *pnp = erts_get_port_names(id, ERTS_INVALID_ERL_DRV_PORT);
 		erts_printf(" port=%T name=%s drv=%s ",
 			    id,
 			    pnp->name ? pnp->name : "unknown",