From 0f4cdc0c5bb750ec4ab7b100dc82d3ff08c9e427 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Mar 2012 19:05:32 +0000
Subject: Explictly close down the StatsReporter so that we can shutdown its
timer
This is another step necessary for the scene to be garbage collected between performance tests
---
OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 6 ++++++
2 files changed, 8 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a01b851..6b28581 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1076,6 +1076,8 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
+ StatsReporter.Close();
+
m_restartTimer.Stop();
m_restartTimer.Close();
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 35cd025..210f48d 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -185,6 +185,12 @@ namespace OpenSim.Region.Framework.Scenes
OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket;
}
+ public void Close()
+ {
+ m_report.Elapsed -= statsHeartBeat;
+ m_report.Close();
+ }
+
public void SetUpdateMS(int ms)
{
statsUpdatesEveryMS = ms;
--
cgit v1.1
From e9d8eb5a270645ece83c864dbd3c84bf226a57f7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Mar 2012 22:31:25 +0000
Subject: Remove unnecessary explicit ElapsedEventHandler in SimReporter
---
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 210f48d..5c56264 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes
m_objectCapacity = scene.RegionInfo.ObjectCapacity;
m_report.AutoReset = true;
m_report.Interval = statsUpdatesEveryMS;
- m_report.Elapsed += new ElapsedEventHandler(statsHeartBeat);
+ m_report.Elapsed += statsHeartBeat;
m_report.Enabled = true;
if (StatsManager.SimExtraStats != null)
--
cgit v1.1
From 98251cdab364baf20537a1b5a6260c68e6630ccf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Mar 2012 23:21:17 +0000
Subject: Add sensor, dataserver requests, timer and listener counts to
"xengine status" command.
This is for diagnostic purposes.
---
OpenSim/Region/Framework/Interfaces/IWorldComm.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index dafbf30..e8e375e 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -50,6 +50,11 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IWorldComm
{
///
+ /// Total number of listeners
+ ///
+ int ListenerCount { get; }
+
+ ///
/// Create a listen event callback with the specified filters.
/// The parameters localID,itemID are needed to uniquely identify
/// the script during 'peek' time. Parameter hostID is needed to
--
cgit v1.1
From 23aba007dd0c6e8983feef6fc078b3d5b674ed3a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Mar 2012 00:04:24 +0000
Subject: Add documentation to make more explicit the difference between
OnRezScript and OnNewScript in the event manager
OnNewScript fires when a script is added to a scene
OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 569c235..6ff2a6f 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -138,8 +138,11 @@ namespace OpenSim.Region.Framework.Scenes
public event OnPermissionErrorDelegate OnPermissionError;
///
- /// Fired when a new script is created.
+ /// Fired when a script is run.
///
+ ///
+ /// Occurs after OnNewScript.
+ ///
public event NewRezScript OnRezScript;
public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource);
@@ -187,10 +190,16 @@ namespace OpenSim.Region.Framework.Scenes
public event ClientClosed OnClientClosed;
- // Fired when a script is created
- // The indication that a new script exists in this region.
public delegate void NewScript(UUID clientID, SceneObjectPart part, UUID itemID);
+
+ ///
+ /// Fired when a script is created.
+ ///
+ ///
+ /// Occurs before OnRezScript
+ ///
public event NewScript OnNewScript;
+
public virtual void TriggerNewScript(UUID clientID, SceneObjectPart part, UUID itemID)
{
NewScript handlerNewScript = OnNewScript;
@@ -212,10 +221,16 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- //TriggerUpdateScript: triggered after Scene receives client's upload of updated script and stores it as asset
- // An indication that the script has changed.
public delegate void UpdateScript(UUID clientID, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID);
+
+ ///
+ /// An indication that the script has changed.
+ ///
+ ///
+ /// Triggered after the scene receives a client's upload of an updated script and has stored it in an asset.
+ ///
public event UpdateScript OnUpdateScript;
+
public virtual void TriggerUpdateScript(UUID clientId, UUID itemId, UUID primId, bool isScriptRunning, UUID newAssetID)
{
UpdateScript handlerUpdateScript = OnUpdateScript;
--
cgit v1.1
From f3678d217f7b1d69faf4aaeb0097348f3d7f91b6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Mar 2012 00:31:18 +0000
Subject: Stop individually deleting objects at the end of each
ObjectTortureTest.
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests.
This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in).
Slightly simplifies config read in Scene constructor to help facilitate this.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 49 ++++++++++++++------------------
1 file changed, 21 insertions(+), 28 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6b28581..11e5ce3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -628,10 +628,10 @@ namespace OpenSim.Region.Framework.Scenes
#region Region Config
- try
+ // Region config overrides global config
+ //
+ if (m_config.Configs["Startup"] != null)
{
- // Region config overrides global config
- //
IConfig startupConfig = m_config.Configs["Startup"];
m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
@@ -721,46 +721,39 @@ namespace OpenSim.Region.Framework.Scenes
m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
}
- catch
- {
- m_log.Warn("[SCENE]: Failed to load StartupConfig");
- }
#endregion Region Config
#region Interest Management
- if (m_config != null)
+ IConfig interestConfig = m_config.Configs["InterestManagement"];
+ if (interestConfig != null)
{
- IConfig interestConfig = m_config.Configs["InterestManagement"];
- if (interestConfig != null)
- {
- string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
-
- try
- {
- m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
- }
- catch (Exception)
- {
- m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
- m_priorityScheme = UpdatePrioritizationSchemes.Time;
- }
+ string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
- m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
- m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
- m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
- m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
+ try
+ {
+ m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
}
+ catch (Exception)
+ {
+ m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
+ m_priorityScheme = UpdatePrioritizationSchemes.Time;
+ }
+
+ m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
+ m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
+ m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
+ m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
}
- m_log.InfoFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
+ m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
#endregion Interest Management
StatsReporter = new SimStatsReporter(this);
StatsReporter.OnSendStatsResult += SendSimStatsPackets;
- StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
+ StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
}
///
--
cgit v1.1