aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs24
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsReporter.cs70
-rw-r--r--OpenSim/Framework/Statistics/StatsManager.cs53
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs21
-rw-r--r--prebuild.xml1
6 files changed, 165 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 6d9a0d6..84c549b 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -31,7 +31,9 @@ using System.Collections.Generic;
31using System.Threading; 31using System.Threading;
32using libsecondlife; 32using libsecondlife;
33using libsecondlife.Packets; 33using libsecondlife.Packets;
34
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Statistics;
35 37
36namespace OpenSim.Framework.Communications.Cache 38namespace OpenSim.Framework.Communications.Cache
37{ 39{
@@ -220,9 +222,13 @@ namespace OpenSim.Framework.Communications.Cache
220 result = "Duplicate ignored."; 222 result = "Duplicate ignored.";
221 } 223 }
222 else 224 else
223 { 225 {
224 TextureImage textur = new TextureImage(asset); 226 TextureImage textur = new TextureImage(asset);
225 Textures.Add(textur.FullID, textur); 227 Textures.Add(textur.FullID, textur);
228
229 if (StatsManager.SimExtraStats != null)
230 StatsManager.SimExtraStats.AddTexture(textur);
231
226 if (asset.Temporary) 232 if (asset.Temporary)
227 { 233 {
228 result = "Added to cache"; 234 result = "Added to cache";
@@ -244,6 +250,10 @@ namespace OpenSim.Framework.Communications.Cache
244 { 250 {
245 AssetInfo assetInf = new AssetInfo(asset); 251 AssetInfo assetInf = new AssetInfo(asset);
246 Assets.Add(assetInf.FullID, assetInf); 252 Assets.Add(assetInf.FullID, assetInf);
253
254 if (StatsManager.SimExtraStats != null)
255 StatsManager.SimExtraStats.AddAsset(assetInf);
256
247 if (asset.Temporary) 257 if (asset.Temporary)
248 { 258 {
249 result = "Added to cache"; 259 result = "Added to cache";
@@ -292,8 +302,12 @@ namespace OpenSim.Framework.Communications.Cache
292 302
293 TextureImage image = new TextureImage(asset); 303 TextureImage image = new TextureImage(asset);
294 if (!Textures.ContainsKey(image.FullID)) 304 if (!Textures.ContainsKey(image.FullID))
295 { 305 {
296 Textures.Add(image.FullID, image); 306 Textures.Add(image.FullID, image);
307
308 if (StatsManager.SimExtraStats != null)
309 StatsManager.SimExtraStats.AddTexture(image);
310
297 if (RequestedTextures.ContainsKey(image.FullID)) 311 if (RequestedTextures.ContainsKey(image.FullID))
298 { 312 {
299 AssetRequest req = RequestedTextures[image.FullID]; 313 AssetRequest req = RequestedTextures[image.FullID];
@@ -312,6 +326,10 @@ namespace OpenSim.Framework.Communications.Cache
312 if (!Assets.ContainsKey(assetInf.FullID)) 326 if (!Assets.ContainsKey(assetInf.FullID))
313 { 327 {
314 Assets.Add(assetInf.FullID, assetInf); 328 Assets.Add(assetInf.FullID, assetInf);
329
330 if (StatsManager.SimExtraStats != null)
331 StatsManager.SimExtraStats.AddAsset(assetInf);
332
315 if (RequestedAssets.ContainsKey(assetInf.FullID)) 333 if (RequestedAssets.ContainsKey(assetInf.FullID))
316 { 334 {
317 AssetRequest req = RequestedAssets[assetInf.FullID]; 335 AssetRequest req = RequestedAssets[assetInf.FullID];
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
new file mode 100644
index 0000000..73f36f9
--- /dev/null
+++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
@@ -0,0 +1,70 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using OpenSim.Framework;
30
31namespace OpenSim.Framework.Statistics
32{
33 public class SimExtraStatsReporter
34 {
35 private long assetsInCache;
36 private long texturesInCache;
37 private long assetCacheMemoryUsage;
38 private long textureCacheMemoryUsage;
39
40 public long AssetsInCache { get { return assetsInCache; } }
41 public long TexturesInCache { get { return texturesInCache; } }
42 public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
43 public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
44
45 public void AddAsset(AssetBase asset)
46 {
47 assetsInCache++;
48 assetCacheMemoryUsage += asset.Data.Length;
49 }
50
51 public void AddTexture(AssetBase image)
52 {
53 texturesInCache++;
54 textureCacheMemoryUsage += image.Data.Length;
55 }
56
57 /// <summary>
58 /// Report back collected statistical information.
59 /// </summary>
60 /// <returns></returns>
61 public string Report()
62 {
63 return string.Format(
64@"Asset cache contains {0,6} assets using {1,10:0.000}K
65Texture cache contains {2,6} textures using {3,10:0.000}K",
66 AssetsInCache, AssetCacheMemoryUsage / 1024.0,
67 TexturesInCache, TextureCacheMemoryUsage / 1024.0);
68 }
69 }
70}
diff --git a/OpenSim/Framework/Statistics/StatsManager.cs b/OpenSim/Framework/Statistics/StatsManager.cs
new file mode 100644
index 0000000..35040e3
--- /dev/null
+++ b/OpenSim/Framework/Statistics/StatsManager.cs
@@ -0,0 +1,53 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29namespace OpenSim.Framework.Statistics
30{
31 /// <summary>
32 /// Singleton used to provide access to statistics reporters
33 /// </summary>
34 public class StatsManager
35 {
36 private static SimExtraStatsReporter simExtraStats;
37
38 public static SimExtraStatsReporter SimExtraStats { get { return simExtraStats; } }
39
40 private StatsManager()
41 {
42 }
43
44 /// <summary>
45 /// Start recording statistics. Should only be called once - calling again will reset statistic
46 /// counts.
47 /// </summary>
48 public static void StartCollecting()
49 {
50 simExtraStats = new SimExtraStatsReporter();
51 }
52 }
53}
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index de16470..c9f7e8e 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Grid.AssetServer
184 break; 184 break;
185 185
186 case "stats": 186 case "stats":
187 MainLog.Instance.Notice("STATS", Environment.NewLine + m_stats.Report()); 187 m_console.Notice("STATS", Environment.NewLine + m_stats.Report());
188 break; 188 break;
189 189
190 case "shutdown": 190 case "shutdown":
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index f0e60cf..70f9fd0 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Statistics;
42using OpenSim.Region.ClientStack; 43using OpenSim.Region.ClientStack;
43using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
44using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
@@ -244,7 +245,7 @@ namespace OpenSim
244 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") 245 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll")
245 { 246 {
246 m_storageDll = "OpenSim.Framework.Data.SQLite.dll"; 247 m_storageDll = "OpenSim.Framework.Data.SQLite.dll";
247 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is depreciated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll."); 248 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll.");
248 Thread.Sleep(3000); 249 Thread.Sleep(3000);
249 } 250 }
250 m_storageConnectionString 251 m_storageConnectionString
@@ -301,8 +302,10 @@ namespace OpenSim
301 302
302 // Create a log instance 303 // Create a log instance
303 m_log = CreateLog(); 304 m_log = CreateLog();
304 MainLog.Instance = m_log; 305 MainLog.Instance = m_log;
305 306
307 StatsManager.StartCollecting();
308
306 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp 309 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
307 // TerrainManager, StorageManager, HTTP Server 310 // TerrainManager, StorageManager, HTTP Server
308 // This base will call abstract Initialize 311 // This base will call abstract Initialize
@@ -703,6 +706,7 @@ namespace OpenSim
703 m_log.Error("show uptime - show simulator startup and uptime."); 706 m_log.Error("show uptime - show simulator startup and uptime.");
704 m_log.Error("show users - show info about connected users."); 707 m_log.Error("show users - show info about connected users.");
705 m_log.Error("show modules - shows info aboutloaded modules."); 708 m_log.Error("show modules - shows info aboutloaded modules.");
709 m_log.Error("stats - statistical information for this server not displayed in the client");
706 m_log.Error("shutdown - disconnect all clients and shutdown."); 710 m_log.Error("shutdown - disconnect all clients and shutdown.");
707 m_log.Error("terrain help - show help for terrain commands."); 711 m_log.Error("terrain help - show help for terrain commands.");
708 break; 712 break;
@@ -883,6 +887,19 @@ namespace OpenSim
883 m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); 887 m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
884 } 888 }
885 break; 889 break;
890
891 case "stats":
892 if (StatsManager.SimExtraStats != null)
893 {
894 MainLog.Instance.Notice(
895 "STATS", Environment.NewLine + StatsManager.SimExtraStats.Report());
896 }
897 else
898 {
899 MainLog.Instance.Notice("STATS", "Extra statistics collection has not been enabled");
900 }
901 break;
902
886 903
887 default: 904 default:
888 m_log.Error("Unknown command"); 905 m_log.Error("Unknown command");
diff --git a/prebuild.xml b/prebuild.xml
index 4201b96..c4ab41b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -93,6 +93,7 @@
93 93
94 <ReferencePath>../../../bin/</ReferencePath> 94 <ReferencePath>../../../bin/</ReferencePath>
95 <Reference name="System"/> 95 <Reference name="System"/>
96 <Reference name="OpenSim.Framework"/>
96 97
97 <Files> 98 <Files>
98 <Match pattern="*.cs" recurse="true"/> 99 <Match pattern="*.cs" recurse="true"/>