core/extworkspace: fix some thread-safety issues

core/internal/server/extworkspace/manager.go

@@ -151,9 +151,8 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 		outputID := e.Output.ID()
 		log.Debugf("ExtWorkspace: Group %d output enter (output=%d)", groupID, outputID)
 
-		group.outputIDs[outputID] = true
-
 		m.post(func() {
+			group.outputIDs[outputID] = true
 			m.updateState()
 		})
 	})
@@ -161,8 +160,8 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 	handle.SetOutputLeaveHandler(func(e ext_workspace.ExtWorkspaceGroupHandleV1OutputLeaveEvent) {
 		outputID := e.Output.ID()
 		log.Debugf("ExtWorkspace: Group %d output leave (output=%d)", groupID, outputID)
-		delete(group.outputIDs, outputID)
 		m.post(func() {
+			delete(group.outputIDs, outputID)
 			m.updateState()
 		})
 	})
@@ -171,6 +170,7 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 		workspaceID := e.Workspace.ID()
 		log.Debugf("ExtWorkspace: Group %d workspace enter (workspace=%d)", groupID, workspaceID)
 
+		m.post(func() {
 			m.workspacesMutex.Lock()
 			if ws, exists := m.workspaces[workspaceID]; exists {
 				ws.groupID = groupID
@@ -178,7 +178,6 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 			m.workspacesMutex.Unlock()
 
 			group.workspaceIDs = append(group.workspaceIDs, workspaceID)
-		m.post(func() {
 			m.updateState()
 		})
 	})
@@ -187,6 +186,7 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 		workspaceID := e.Workspace.ID()
 		log.Debugf("ExtWorkspace: Group %d workspace leave (workspace=%d)", groupID, workspaceID)
 
+		m.post(func() {
 			m.workspacesMutex.Lock()
 			if ws, exists := m.workspaces[workspaceID]; exists {
 				ws.groupID = 0
@@ -199,20 +199,20 @@ func (m *Manager) handleWorkspaceGroup(e ext_workspace.ExtWorkspaceManagerV1Work
 					break
 				}
 			}
-		m.post(func() {
 			m.updateState()
 		})
 	})
 
 	handle.SetRemovedHandler(func(e ext_workspace.ExtWorkspaceGroupHandleV1RemovedEvent) {
 		log.Debugf("ExtWorkspace: Group %d removed", groupID)
+
+		m.post(func() {
 			group.removed = true
 
 			m.groupsMutex.Lock()
 			delete(m.groups, groupID)
 			m.groupsMutex.Unlock()
 
-		m.post(func() {
 			m.wlMutex.Lock()
 			handle.Destroy()
 			m.wlMutex.Unlock()
@@ -240,16 +240,16 @@ func (m *Manager) handleWorkspace(e ext_workspace.ExtWorkspaceManagerV1Workspace
 
 	handle.SetIdHandler(func(e ext_workspace.ExtWorkspaceHandleV1IdEvent) {
 		log.Debugf("ExtWorkspace: Workspace %d id: %s", workspaceID, e.Id)
-		ws.workspaceID = e.Id
 		m.post(func() {
+			ws.workspaceID = e.Id
 			m.updateState()
 		})
 	})
 
 	handle.SetNameHandler(func(e ext_workspace.ExtWorkspaceHandleV1NameEvent) {
 		log.Debugf("ExtWorkspace: Workspace %d name: %s", workspaceID, e.Name)
-		ws.name = e.Name
 		m.post(func() {
+			ws.name = e.Name
 			m.updateState()
 		})
 	})
@@ -266,16 +266,16 @@ func (m *Manager) handleWorkspace(e ext_workspace.ExtWorkspaceManagerV1Workspace
 			}
 		}
 		log.Debugf("ExtWorkspace: Workspace %d coordinates: %v", workspaceID, coords)
-		ws.coordinates = coords
 		m.post(func() {
+			ws.coordinates = coords
 			m.updateState()
 		})
 	})
 
 	handle.SetStateHandler(func(e ext_workspace.ExtWorkspaceHandleV1StateEvent) {
 		log.Debugf("ExtWorkspace: Workspace %d state: %d", workspaceID, e.State)
-		ws.state = e.State
 		m.post(func() {
+			ws.state = e.State
 			m.updateState()
 		})
 	})
@@ -286,13 +286,14 @@ func (m *Manager) handleWorkspace(e ext_workspace.ExtWorkspaceManagerV1Workspace
 
 	handle.SetRemovedHandler(func(e ext_workspace.ExtWorkspaceHandleV1RemovedEvent) {
 		log.Debugf("ExtWorkspace: Workspace %d removed", workspaceID)
+
+		m.post(func() {
 			ws.removed = true
 
 			m.workspacesMutex.Lock()
 			delete(m.workspaces, workspaceID)
 			m.workspacesMutex.Unlock()
 
-		m.post(func() {
 			m.wlMutex.Lock()
 			handle.Destroy()
 			m.wlMutex.Unlock()
@@ -422,6 +423,9 @@ func (m *Manager) notifier() {
 }
 
 func (m *Manager) ActivateWorkspace(groupID, workspaceID string) error {
+	errChan := make(chan error, 1)
+
+	m.post(func() {
 		m.workspacesMutex.RLock()
 		defer m.workspacesMutex.RUnlock()
 
@@ -444,14 +448,21 @@ func (m *Manager) ActivateWorkspace(groupID, workspaceID string) error {
 					err = m.manager.Commit()
 				}
 				m.wlMutex.Unlock()
-			return err
+				errChan <- err
+				return
 			}
 		}
 
-	return fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+		errChan <- fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+	})
+
+	return <-errChan
 }
 
 func (m *Manager) DeactivateWorkspace(groupID, workspaceID string) error {
+	errChan := make(chan error, 1)
+
+	m.post(func() {
 		m.workspacesMutex.RLock()
 		defer m.workspacesMutex.RUnlock()
 
@@ -474,14 +485,21 @@ func (m *Manager) DeactivateWorkspace(groupID, workspaceID string) error {
 					err = m.manager.Commit()
 				}
 				m.wlMutex.Unlock()
-			return err
+				errChan <- err
+				return
 			}
 		}
 
-	return fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+		errChan <- fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+	})
+
+	return <-errChan
 }
 
 func (m *Manager) RemoveWorkspace(groupID, workspaceID string) error {
+	errChan := make(chan error, 1)
+
+	m.post(func() {
 		m.workspacesMutex.RLock()
 		defer m.workspacesMutex.RUnlock()
 
@@ -504,14 +522,21 @@ func (m *Manager) RemoveWorkspace(groupID, workspaceID string) error {
 					err = m.manager.Commit()
 				}
 				m.wlMutex.Unlock()
-			return err
+				errChan <- err
+				return
 			}
 		}
 
-	return fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+		errChan <- fmt.Errorf("workspace not found: %s in group %s", workspaceID, groupID)
+	})
+
+	return <-errChan
 }
 
 func (m *Manager) CreateWorkspace(groupID, workspaceName string) error {
+	errChan := make(chan error, 1)
+
+	m.post(func() {
 		m.groupsMutex.RLock()
 		defer m.groupsMutex.RUnlock()
 
@@ -523,11 +548,15 @@ func (m *Manager) CreateWorkspace(groupID, workspaceName string) error {
 					err = m.manager.Commit()
 				}
 				m.wlMutex.Unlock()
-			return err
+				errChan <- err
+				return
 			}
 		}
 
-	return fmt.Errorf("workspace group not found: %s", groupID)
+		errChan <- fmt.Errorf("workspace group not found: %s", groupID)
+	})
+
+	return <-errChan
 }
 
 func (m *Manager) Close() {