3 files changed, 39 insertions, 19 deletions
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index 3a231206ae..e2a79d6e4f 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1996-2010. 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%
  */
 
diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h
index c10218e431..cb245a87b1 100644
--- a/erts/emulator/beam/atom.h
+++ b/erts/emulator/beam/atom.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1996-2010. 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%
  */
 
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index b519b39d63..2789691c55 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -2765,7 +2765,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 	    p->flags |= F_HAVE_BLCKD_MSCHED;
 	    ASSERT(erts_smp_atomic_read(&schdlr_sspnd.active) == 1);
 	    ASSERT(p->scheduler_data->no == 1);
-	    res = 1;
+	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
 	}
 	else {
 	    p->flags |= F_HAVE_BLCKD_MSCHED;
@@ -2896,12 +2896,16 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 #endif
 	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
 	    erts_smp_atomic_set(&schdlr_sspnd.msb.ongoing, 0);
-	    if (schdlr_sspnd.online == 1)
-		/* No schedulers to resume */;
+	    if (schdlr_sspnd.online == 1) {
+		/* No schedulers to resume */
+		ASSERT(erts_smp_atomic_read(&schdlr_sspnd.active) == 1);
+		schdlr_sspnd.changing = 0;
+	    }
 	    else if (erts_common_run_queue) {
 		for (ix = 1; ix < schdlr_sspnd.online; ix++)
 		    erts_smp_atomic_set(&ERTS_SCHEDULER_IX(ix)->suspended, 0);
 		wake_all_schedulers();
+		erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 	    }
 	    else {
 		int online = schdlr_sspnd.online;
@@ -2933,8 +2937,8 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		erts_smp_runq_unlock(ERTS_RUNQ_IX(0));
 		erts_smp_mtx_unlock(&balance_info.update_mtx);
 		erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+		erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 	    }
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 	    res = ERTS_SCHDLR_SSPND_DONE;
 	}
     }
@@ -8033,11 +8037,6 @@ erts_do_exit_process(Process* p, Eterm reason)
     if (p->bif_timers)
 	erts_cancel_bif_timers(p, ERTS_PROC_LOCKS_ALL);
 
-#ifdef ERTS_SMP
-    if (p->flags & F_HAVE_BLCKD_MSCHED)
-	erts_block_multi_scheduling(p, ERTS_PROC_LOCKS_ALL, 0, 1);
-#endif
-
     erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL_MINOR);
 
 #ifdef ERTS_SMP
@@ -8082,6 +8081,27 @@ continue_exit_process(Process *p
     erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
 #endif
 
+#ifdef ERTS_SMP
+    if (p->flags & F_HAVE_BLCKD_MSCHED) {
+	ErtsSchedSuspendResult ssr;
+	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 1);
+	switch (ssr) {
+	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
+	    goto yield;
+	case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_DONE:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE:
+	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
+	    break;
+	case ERTS_SCHDLR_SSPND_EINVAL:
+	default:
+	    erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
+		     __FILE__, __LINE__, (int) ssr);
+	}
+    }
+#endif
+
     if (p->flags & F_USING_DB) {
 	if (erts_db_process_exiting(p, ERTS_PROC_LOCK_MAIN))
 	    goto yield;