From a4bf98f4ba6ecc27d1af0092b6e2a1bac36ed44d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 31 Jan 2008 00:42:31 +0000 Subject: * Add asset/texture cache statistics to region server console * You can type 'stats' at the REGION# prompt to get this information in grid or standalone mode * Don't take these numbers as gospel yet, since for some reason textures displayed from inventory which require downloading from the server are being recorded as assets rather than textures * But I don't have any reason to believe they aren't broadly accurate. * I've put these in so I can tell whether the high memory usage on regions is down to the asset/texture cache * This will require a prebuild * DEV: Only adds needed to be implemented since, as far as I can tell, assets cached are currently never released. For my part, seeing large cache memory numbers will provoke me to think about doing something about this. * DEV: Now switched to using a singleton to get the stats reporters rather than threading the object through various layers * DEV: Will refactor the other server stats reporters to do this in one of the next commits --- .../Framework/Statistics/SimExtraStatsReporter.cs | 70 ++++++++++++++++++++++ OpenSim/Framework/Statistics/StatsManager.cs | 53 ++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 OpenSim/Framework/Statistics/SimExtraStatsReporter.cs create mode 100644 OpenSim/Framework/Statistics/StatsManager.cs (limited to 'OpenSim/Framework/Statistics') 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 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + +using OpenSim.Framework; + +namespace OpenSim.Framework.Statistics +{ + public class SimExtraStatsReporter + { + private long assetsInCache; + private long texturesInCache; + private long assetCacheMemoryUsage; + private long textureCacheMemoryUsage; + + public long AssetsInCache { get { return assetsInCache; } } + public long TexturesInCache { get { return texturesInCache; } } + public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } } + public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } } + + public void AddAsset(AssetBase asset) + { + assetsInCache++; + assetCacheMemoryUsage += asset.Data.Length; + } + + public void AddTexture(AssetBase image) + { + texturesInCache++; + textureCacheMemoryUsage += image.Data.Length; + } + + /// + /// Report back collected statistical information. + /// + /// + public string Report() + { + return string.Format( +@"Asset cache contains {0,6} assets using {1,10:0.000}K +Texture cache contains {2,6} textures using {3,10:0.000}K", + AssetsInCache, AssetCacheMemoryUsage / 1024.0, + TexturesInCache, TextureCacheMemoryUsage / 1024.0); + } + } +} 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 @@ +/* +* Copyright (c) Contributors, http://opensimulator.org/ +* See CONTRIBUTORS.TXT for a full list of copyright holders. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* * Redistributions of source code must retain the above copyright +* notice, this list of conditions and the following disclaimer. +* * Redistributions in binary form must reproduce the above copyright +* notice, this list of conditions and the following disclaimer in the +* documentation and/or other materials provided with the distribution. +* * Neither the name of the OpenSim Project nor the +* names of its contributors may be used to endorse or promote products +* derived from this software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY +* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +* +*/ + +namespace OpenSim.Framework.Statistics +{ + /// + /// Singleton used to provide access to statistics reporters + /// + public class StatsManager + { + private static SimExtraStatsReporter simExtraStats; + + public static SimExtraStatsReporter SimExtraStats { get { return simExtraStats; } } + + private StatsManager() + { + } + + /// + /// Start recording statistics. Should only be called once - calling again will reset statistic + /// counts. + /// + public static void StartCollecting() + { + simExtraStats = new SimExtraStatsReporter(); + } + } +} -- cgit v1.1