OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Refactor additional stats collection common code into base opensim server 

* If extra stats not sent to the viewer are available on an opensim server, they are now uniformly accessible using the 'show stats' command
0.6.0-stable
Justin Clarke Casey 2008-05-14 21:53:40 +00:00
parent 56faeafdae
commit 0f50162961
11 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -27,6 +27,7 @@
using System;
using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics;
namespace OpenSim.Framework.Servers
{
@ -44,6 +45,11 @@ namespace OpenSim.Framework.Servers
get { return m_httpServer; }
}
/// <summary>
/// Holds the non-viewer statistics collection object for this service/server
/// </summary>
protected IStatsCollector m_stats;
public BaseOpenSimServer()
{
m_startuptime = DateTime.Now;
@ -72,6 +78,10 @@ namespace OpenSim.Framework.Servers
{
case "help":
Notice("quit - equivalent to shutdown.");
if (m_stats != null)
Notice("show stats - statistical information for this server");
Notice("show uptime - show server startup and uptime.");
Notice("shutdown - shutdown the server.\n");
break;
@ -98,6 +108,13 @@ namespace OpenSim.Framework.Servers
{
switch (ShowWhat)
{
case "stats":
if (m_stats != null)
{
Notice(m_stats.Report());
}
break;
case "uptime":
Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString());
Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString());

2
OpenSim/Framework/Statistics/AssetStatsCollector.cs
View File

@ -33,7 +33,7 @@ namespace OpenSim.Framework.Statistics
/// <summary>
/// Asset service statistics collection
/// </summary>
public class AssetStatsCollector
public class AssetStatsCollector : IStatsCollector
{
private Timer ageStatsTimer = new Timer(24 * 60 * 60 * 1000);
private DateTime startTime = DateTime.Now;

41
OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs Normal file
View File

@ -0,0 +1,41 @@
/*
* 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
{
/// <summary>
/// Implemented by classes which collect up non-viewer statistical information
/// </summary>
public interface IStatsCollector
{
/// <summary>
/// Report back collected statistical information.
/// </summary>
/// <returns></returns>
string Report();
}
}

4
OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
View File

@ -36,7 +36,7 @@ namespace OpenSim.Framework.Statistics
/// <summary>
/// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane
/// </summary>
public class SimExtraStatsCollector
public class SimExtraStatsCollector : IStatsCollector
{
private long assetsInCache;
private long texturesInCache;
@ -135,7 +135,7 @@ Texture cache contains {2,6} textures using {3,10:0.000}K" + Environment.NewLine
/// <summary>
/// Pull packet queue stats from packet queues and report
/// </summary>
public class PacketQueueStatsCollector
public class PacketQueueStatsCollector : IStatsCollector
{
private IPullStatsProvider m_statsProvider;

12
OpenSim/Framework/Statistics/StatsManager.cs
View File

@ -46,27 +46,33 @@ namespace OpenSim.Framework.Statistics
/// Start collecting statistics related to assets.
/// Should only be called once.
/// </summary>
public static void StartCollectingAssetStats()
public static AssetStatsCollector StartCollectingAssetStats()
{
assetStats = new AssetStatsCollector();
return assetStats;
}
/// <summary>
/// Start collecting statistics related to users.
/// Should only be called once.
/// </summary>
public static void StartCollectingUserStats()
public static UserStatsCollector StartCollectingUserStats()
{
userStats = new UserStatsCollector();
return userStats;
}
/// <summary>
/// Start collecting extra sim statistics apart from those collected for the client.
/// Should only be called once.
/// </summary>
public static void StartCollectingSimExtraStats()
public static SimExtraStatsCollector StartCollectingSimExtraStats()
{
simExtraStats = new SimExtraStatsCollector();
return simExtraStats;
}
}
}

2
OpenSim/Framework/Statistics/UserStatsCollector.cs
View File

@ -32,7 +32,7 @@ namespace OpenSim.Framework.Statistics
/// <summary>
/// Collects user service statistics
/// </summary>
public class UserStatsCollector
public class UserStatsCollector : IStatsCollector
{
private Timer ageStatsTimer = new Timer(24 * 60 * 60 * 1000);

11
OpenSim/Grid/AssetServer/Main.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Grid.AssetServer
m_log.Info("[ASSET]: Starting HTTP process");
m_httpServer = new BaseHttpServer(m_config.HttpPort);
StatsManager.StartCollectingAssetStats();
m_stats = StatsManager.StartCollectingAssetStats();
AddHttpHandlers();
@ -180,15 +180,6 @@ namespace OpenSim.Grid.AssetServer
switch (cmd)
{
case "help":
m_console.Notice("stats - statistical information for this server");
break;
case "stats":
m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
break;
case "shutdown":
m_console.Close();
Environment.Exit(0);

7
OpenSim/Grid/UserServer/Main.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Grid.UserServer
{
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
StatsManager.StartCollectingUserStats();
m_stats = StatsManager.StartCollectingUserStats();
m_log.Info("[REGION]: Establishing data connection");
m_userManager = new UserManager();
@ -219,17 +219,12 @@ namespace OpenSim.Grid.UserServer
{
case "help":
m_console.Notice("create user - create a new user");
m_console.Notice("stats - statistical information for this server");
break;
case "create":
do_create(cmdparams[0]);
break;
case "stats":
m_console.Notice(StatsManager.UserStats.Report());
break;
case "test-inventory":
// RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
// requester.ReturnResponseVal = TestResponse;

2
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -391,7 +391,7 @@ namespace OpenSim
{
printAvailableVersionInformation();
StatsManager.StartCollectingSimExtraStats();
m_stats = StatsManager.StartCollectingSimExtraStats();
// Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
// TerrainManager, StorageManager, HTTP Server

13
OpenSim/Region/Application/OpenSimMainConsole.cs
View File

@ -253,7 +253,6 @@ namespace OpenSim
m_console.Notice("show assets - show state of asset cache.");
m_console.Notice("show users - show info about connected users.");
m_console.Notice("show modules - shows info about loaded modules.");
m_console.Notice("show stats - statistical information for this server");
m_console.Notice("show version - show the running build version.");
m_console.Notice("threads - list threads");
m_console.Notice("config set section field value - set a config value");
@ -596,18 +595,6 @@ namespace OpenSim
});
break;
case "stats":
if (StatsManager.SimExtraStats != null)
{
m_console.Notice(
"STATS", Environment.NewLine + StatsManager.SimExtraStats.Report());
}
else
{
m_console.Notice("Extra sim statistics collection has not been enabled");
}
break;
case "version":
if (!string.IsNullOrEmpty(buildVersion))
{

1
prebuild.xml
View File

@ -451,6 +451,7 @@
<Reference name="System.Xml"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="libsecondlife.dll"/>
<Reference name="XMLRPC.dll"/>
<Reference name="log4net"/>