go/runtime/host: Always emit StoppedEvent on stop

Previously the StoppedEvent was only emitted in case the runtime was previously running. In case multihost was performing a version switch when a runtime was not yet started, this resulted in a deadlock.
oasisprotocol · Apr 7, 2022 · 6aab8d5 · 6aab8d5
1 parent 07bc8cd
commit 6aab8d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changelog/4647.bugfix.md b/.changelog/4647.bugfix.md
@@ -0,0 +1,5 @@
+go/runtime/host: Always emit StoppedEvent on stop
+
+Previously the StoppedEvent was only emitted in case the runtime was
+previously running. In case multihost was performing a version switch when a
+runtime was not yet started, this resulted in a deadlock.
diff --git a/go/runtime/host/sandbox/sandbox.go b/go/runtime/host/sandbox/sandbox.go
@@ -437,11 +437,11 @@ func (r *sandboxedRuntime) manager() {
 			r.Lock()
 			r.conn = nil
 			r.Unlock()
-
-			// Notify subscribers that the runtime has stopped.
-			r.notifier.Broadcast(&host.Event{Stopped: &host.StoppedEvent{}})
 		}
 
+		// Notify subscribers that the runtime has stopped.
+		r.notifier.Broadcast(&host.Event{Stopped: &host.StoppedEvent{}})
+
 		close(r.quitCh)
 	}()