2 files changed, 47 insertions, 18 deletions

diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index dbc4a06c2d..8cf8128ab8 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -1509,7 +1509,6 @@ fail:
 void
 erts_port_task_free_port(Port *pp)
 {
-    ErtsProcList *suspended;
     erts_aint32_t flags;
     ErtsRunQueue *runq;
 
@@ -1522,19 +1521,16 @@ erts_port_task_free_port(Port *pp)
     erts_port_task_sched_lock(&pp->sched);
     flags = erts_smp_atomic32_read_bor_relb(&pp->sched.flags,
 					    ERTS_PTS_FLG_EXIT);
-    suspended = pp->suspended;
-    pp->suspended = NULL;
     erts_port_task_sched_unlock(&pp->sched);
     erts_atomic32_read_bset_relb(&pp->state,
-				 (ERTS_PORT_SFLG_CLOSING
+				 (ERTS_PORT_SFLG_CONNECTED
+				  | ERTS_PORT_SFLG_EXITING
+				  | ERTS_PORT_SFLG_CLOSING
 				  | ERTS_PORT_SFLG_FREE),
 				 ERTS_PORT_SFLG_FREE);
 
     erts_smp_runq_unlock(runq);
 
-    if (erts_proclist_fetch(&suspended, NULL))
-	erts_resume_processes(suspended);
-
     if (!(flags & (ERTS_PTS_FLG_IN_RUNQ|ERTS_PTS_FLG_EXEC)))
 	begin_port_cleanup(pp, NULL, NULL);
 }
@@ -1793,10 +1789,11 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
     int i, max;
     ErtsPortTaskBusyCallerTable *tabp;
     ErtsPortTask *qs[3];
+    ErtsPortTaskHandleList *free_nshp = NULL;
+    ErtsProcList *plp;
 
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(pp));
 
-
     /*
      * Abort remaining tasks...
      *
@@ -1935,7 +1932,42 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
 
     erts_smp_atomic32_read_band_nob(&pp->sched.flags,
 				    ~(ERTS_PTS_FLG_HAVE_BUSY_TASKS
-				      |ERTS_PTS_FLG_HAVE_TASKS));
+				      |ERTS_PTS_FLG_HAVE_TASKS
+				      |ERTS_PTS_FLGS_BUSY));
+
+    erts_port_task_sched_lock(&pp->sched);
+
+    /* Cleanup nosuspend handles... */
+    free_nshp = (pp->sched.taskq.local.busy.nosuspend
+		 ? get_free_nosuspend_handles(pp)
+		 : NULL);
+    ASSERT(!pp->sched.taskq.local.busy.nosuspend);
+
+    /* Make sure not to leave any processes suspended on the port... */
+    plp = pp->suspended;
+    pp->suspended = NULL;
+
+    erts_port_task_sched_unlock(&pp->sched);
+
+    if (free_nshp)
+	free_nosuspend_handles(free_nshp);
+
+    if (erts_proclist_fetch(&plp, NULL)) {
+#ifdef USE_VM_PROBES
+	if (DTRACE_ENABLED(process_port_unblocked)) {
+	    DTRACE_CHARBUF(port_str, 16);
+	    DTRACE_CHARBUF(pid_str, 16);
+	    ErtsProcList* plp2 = plp;
+
+	    erts_snprintf(port_str, sizeof(port_str), "%T", pp->common.id);
+	    while (plp2 != NULL) {
+		erts_snprintf(pid_str, sizeof(pid_str), "%T", plp2->pid);
+		DTRACE2(process_port_unblocked, pid_str, port_str);
+	    }
+	}
+#endif
+	erts_resume_processes(plp);
+    }
 
     /*
      * Schedule cleanup of port structure...
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 3ea4b24848..a944340400 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -3470,7 +3470,7 @@ erts_deliver_port_exit(Port *p, Eterm from, Eterm reason, int send_closed)
 {
    ErtsLink *lnk;
    Eterm rreason;
-   erts_aint32_t state;
+   erts_aint32_t state, set_state_flags;
 
    ERTS_SMP_CHK_NO_PROC_LOCKS;
    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
@@ -3499,9 +3499,12 @@ erts_deliver_port_exit(Port *p, Eterm from, Eterm reason, int send_closed)
    if (reason == am_normal && from != ERTS_PORT_GET_CONNECTED(p) && from != p->common.id)
        return 0;
 
+   set_state_flags = ERTS_PORT_SFLG_EXITING;
    if (send_closed)
-       erts_atomic32_read_bor_relb(&p->state,
-				   ERTS_PORT_SFLG_SEND_CLOSED);
+       set_state_flags |= ERTS_PORT_SFLG_SEND_CLOSED;
+
+   state = erts_atomic32_read_bor_mb(&p->state, set_state_flags);
+   state |= set_state_flags;
 
    if (IS_TRACED_FL(p, F_TRACE_PORTS)) {
    	trace_port(p, am_closed, reason);
@@ -3509,17 +3512,11 @@ erts_deliver_port_exit(Port *p, Eterm from, Eterm reason, int send_closed)
 
    erts_trace_check_exiting(p->common.id);
 
-   /*
-    * Setting the port to not busy here, frees the list of pending
-    * processes and makes them runnable.
-    */
    set_busy_port((ErlDrvPort) p, 0);
 
    if (p->common.u.alive.reg != NULL)
        (void) erts_unregister_name(NULL, 0, p, p->common.u.alive.reg->name);
 
-   state = erts_atomic32_read_bor_relb(&p->state, ERTS_PORT_SFLG_EXITING);
-
    {
        SweepContext sc = {p->common.id, rreason};
        lnk = ERTS_P_LINKS(p);