From 8c8c8a00a47b61fcfd4a500ac8f13aa1aafaad26 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 23 Nov 2012 02:22:30 +0000 Subject: Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object. --- OpenSim/Region/Application/OpenSim.cs | 20 +++++++++++ OpenSim/Region/Application/OpenSimBase.cs | 11 +++--- OpenSim/Region/Framework/Scenes/Scene.cs | 10 ++---- OpenSim/Region/Framework/Scenes/SceneManager.cs | 46 ++++++++++++------------- 4 files changed, 51 insertions(+), 36 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 17b2167..cffbb3b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -664,12 +664,20 @@ namespace OpenSim if (!SceneManager.TrySetCurrentScene(newRegionName)) MainConsole.Instance.Output(String.Format("Couldn't select region {0}", newRegionName)); + else + RefreshPrompt(); } else { MainConsole.Instance.Output("Usage: change region "); } + } + /// + /// Refreshs prompt with the current selection details. + /// + private void RefreshPrompt() + { string regionName = (SceneManager.CurrentScene == null ? "root" : SceneManager.CurrentScene.RegionInfo.RegionName); MainConsole.Instance.Output(String.Format("Currently selected region is {0}", regionName)); @@ -691,6 +699,18 @@ namespace OpenSim m_console.ConsoleScene = SceneManager.CurrentScene; } + protected override void HandleRestartRegion(RegionInfo whichRegion) + { + base.HandleRestartRegion(whichRegion); + + // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the + // m_console.ConsoleScene to null (indicating all scenes). + if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name) + SceneManager.TrySetCurrentScene(whichRegion.RegionName); + + RefreshPrompt(); + } + /// /// Turn on some debugging values for OpenSim. /// diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b40aa4b..c3c87e7 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -299,7 +299,7 @@ namespace OpenSim // Called from base.StartUp() m_httpServerPort = m_networkServersInfo.HttpListenerPort; - SceneManager.OnRestartSim += handleRestartRegion; + SceneManager.OnRestartSim += HandleRestartRegion; // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is // heavily used during initial startup. @@ -735,9 +735,11 @@ namespace OpenSim } } - public void handleRestartRegion(RegionInfo whichRegion) + protected virtual void HandleRestartRegion(RegionInfo whichRegion) { - m_log.Info("[OPENSIM]: Got restart signal from SceneManager"); + m_log.InfoFormat( + "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", + whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY); ShutdownClientServer(whichRegion); IScene scene; @@ -883,7 +885,6 @@ namespace OpenSim m_log.Info("[SHUTDOWN]: Closing all threads"); m_log.Info("[SHUTDOWN]: Killing listener thread"); m_log.Info("[SHUTDOWN]: Killing clients"); - // TODO: implement this m_log.Info("[SHUTDOWN]: Closing console and terminating"); try @@ -892,7 +893,7 @@ namespace OpenSim } catch (Exception e) { - m_log.ErrorFormat("[SHUTDOWN]: Ignoring failure during shutdown - {0}", e); + m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index db45d6b..8ef22bd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1134,15 +1134,9 @@ namespace OpenSim.Region.Framework.Scenes } } - m_log.Error("[REGION]: Closing"); - Close(); + m_log.InfoFormat("[REGION]: Restarting region {0}", Name); - if (PhysicsScene != null) - { - PhysicsScene.Dispose(); - } - - m_log.Error("[REGION]: Firing Region Restart Message"); + Close(); base.Restart(); } diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 1c236db..1e2e973 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -100,23 +100,25 @@ namespace OpenSim.Region.Framework.Scenes } private readonly List m_localScenes = new List(); - private Scene m_currentScene = null; public List Scenes { get { return new List(m_localScenes); } } - public Scene CurrentScene - { - get { return m_currentScene; } - } + /// + /// Scene selected from the console. + /// + /// + /// If null, then all scenes are considered selected (signalled as "Root" on the console). + /// + public Scene CurrentScene { get; private set; } public Scene CurrentOrFirstScene { get { - if (m_currentScene == null) + if (CurrentScene == null) { lock (m_localScenes) { @@ -128,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes } else { - return m_currentScene; + return CurrentScene; } } } @@ -178,8 +180,7 @@ namespace OpenSim.Region.Framework.Scenes public void HandleRestart(RegionInfo rdata) { - m_log.Error("[SCENEMANAGER]: Got Restart message for region:" + rdata.RegionName + " Sending up to main"); - int RegionSceneElement = -1; + Scene restartedScene = null; lock (m_localScenes) { @@ -187,19 +188,18 @@ namespace OpenSim.Region.Framework.Scenes { if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName) { - RegionSceneElement = i; + restartedScene = m_localScenes[i]; + m_localScenes.RemoveAt(i); + break; } } - - // Now we make sure the region is no longer known about by the SceneManager - // Prevents duplicates. - - if (RegionSceneElement >= 0) - { - m_localScenes.RemoveAt(RegionSceneElement); - } } + // If the currently selected scene has been restarted, then we can't reselect here since we the scene + // hasn't yet been recreated. We will have to leave this to the caller. + if (CurrentScene == restartedScene) + CurrentScene = null; + // Send signal to main that we're restarting this sim. OnRestartSim(rdata); } @@ -341,14 +341,14 @@ namespace OpenSim.Region.Framework.Scenes private void ForEachCurrentScene(Action func) { - if (m_currentScene == null) + if (CurrentScene == null) { lock (m_localScenes) m_localScenes.ForEach(func); } else { - func(m_currentScene); + func(CurrentScene); } } @@ -368,7 +368,7 @@ namespace OpenSim.Region.Framework.Scenes || (String.Compare(regionName, "..") == 0) || (String.Compare(regionName, "/") == 0)) { - m_currentScene = null; + CurrentScene = null; return true; } else @@ -379,7 +379,7 @@ namespace OpenSim.Region.Framework.Scenes { if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0) { - m_currentScene = scene; + CurrentScene = scene; return true; } } @@ -399,7 +399,7 @@ namespace OpenSim.Region.Framework.Scenes { if (scene.RegionInfo.RegionID == regionID) { - m_currentScene = scene; + CurrentScene = scene; return true; } } -- cgit v1.1