aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-25 23:27:00 +0100
committerJustin Clark-Casey (justincc)2012-07-25 23:27:00 +0100
commit5aec0ff207e9427b8756471eb003fd68859f67b1 (patch)
tree1b347a9086a1b07c696272b7e52dcbd7d98007e4
parentRename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. (diff)
downloadopensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.zip
opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.gz
opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.bz2
opensim-SC_OLD-5aec0ff207e9427b8756471eb003fd68859f67b1.tar.xz
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
-rw-r--r--OpenSim/Framework/Monitoring/MemoryWatchdog.cs (renamed from OpenSim/Framework/MemoryWatchdog.cs)2
-rw-r--r--OpenSim/Framework/Monitoring/Watchdog.cs (renamed from OpenSim/Framework/Watchdog.cs)2
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs1
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs1
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs1
-rw-r--r--prebuild.xml55
14 files changed, 42 insertions, 28 deletions
diff --git a/OpenSim/Framework/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index 1e93077..6599613 100644
--- a/OpenSim/Framework/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Threading; 32using System.Threading;
33using log4net; 33using log4net;
34 34
35namespace OpenSim.Framework 35namespace OpenSim.Framework.Monitoring
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// Experimental watchdog for memory usage. 38 /// Experimental watchdog for memory usage.
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 54e3d1a..d4cf02f 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -31,7 +31,7 @@ using System.Linq;
31using System.Threading; 31using System.Threading;
32using log4net; 32using log4net;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework.Monitoring
35{ 35{
36 /// <summary> 36 /// <summary>
37 /// Manages launching threads and keeping watch over them for timeouts 37 /// Manages launching threads and keeping watch over them for timeouts
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ab8d95a..2a8ae38 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -40,6 +40,7 @@ using log4net.Core;
40using log4net.Repository; 40using log4net.Repository;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Framework.Console; 42using OpenSim.Framework.Console;
43using OpenSim.Framework.Monitoring;
43using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
44using OpenSim.Framework.Servers.HttpServer; 45using OpenSim.Framework.Servers.HttpServer;
45using OpenSim.Framework.Monitoring; 46using OpenSim.Framework.Monitoring;
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 3de7f9c..f57ea76 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -45,6 +45,7 @@ using OpenMetaverse.StructuredData;
45using CoolHTTPListener = HttpServer.HttpListener; 45using CoolHTTPListener = HttpServer.HttpListener;
46using HttpListener=System.Net.HttpListener; 46using HttpListener=System.Net.HttpListener;
47using LogPrio=HttpServer.LogPrio; 47using LogPrio=HttpServer.LogPrio;
48using OpenSim.Framework.Monitoring;
48 49
49namespace OpenSim.Framework.Servers.HttpServer 50namespace OpenSim.Framework.Servers.HttpServer
50{ 51{
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 3252251..8d50151 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -32,6 +32,7 @@ using System.Reflection;
32using log4net; 32using log4net;
33using HttpServer; 33using HttpServer;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Monitoring;
35 36
36namespace OpenSim.Framework.Servers.HttpServer 37namespace OpenSim.Framework.Servers.HttpServer
37{ 38{
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 35a8dee..5adbcd1 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -34,6 +34,7 @@ using HttpServer;
34using OpenMetaverse; 34using OpenMetaverse;
35using System.Reflection; 35using System.Reflection;
36using log4net; 36using log4net;
37using OpenSim.Framework.Monitoring;
37 38
38namespace OpenSim.Framework.Servers.HttpServer 39namespace OpenSim.Framework.Servers.HttpServer
39{ 40{
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index a6e2548..4a76b00 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -40,6 +40,7 @@ using OpenMetaverse;
40using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Framework.Capabilities; 42using OpenSim.Framework.Capabilities;
43using OpenSim.Framework.Monitoring;
43using OpenSim.Framework.Servers; 44using OpenSim.Framework.Servers;
44using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 724533b..dfba3ff 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -42,6 +42,7 @@ using OpenMetaverse.Imaging;
42using OpenMetaverse.StructuredData; 42using OpenMetaverse.StructuredData;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Framework.Capabilities; 44using OpenSim.Framework.Capabilities;
45using OpenSim.Framework.Monitoring;
45using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
46using OpenSim.Framework.Servers.HttpServer; 47using OpenSim.Framework.Servers.HttpServer;
47using OpenSim.Region.Framework.Interfaces; 48using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 20918bd..24f62e3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -40,6 +40,7 @@ using OpenMetaverse;
40using OpenMetaverse.Packets; 40using OpenMetaverse.Packets;
41using OpenMetaverse.Imaging; 41using OpenMetaverse.Imaging;
42using OpenSim.Framework; 42using OpenSim.Framework;
43using OpenSim.Framework.Monitoring;
43using OpenSim.Services.Interfaces; 44using OpenSim.Services.Interfaces;
44using OpenSim.Framework.Communications; 45using OpenSim.Framework.Communications;
45using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 5043208..bae25cd 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -38,6 +38,7 @@ using OpenMetaverse;
38using OpenMetaverse.Packets; 38using OpenMetaverse.Packets;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Client; 40using OpenSim.Framework.Client;
41using OpenSim.Framework.Monitoring;
41using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
42 43
43namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server 44namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
index a7c5020..9d27386 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
@@ -34,6 +34,7 @@ using System.Text;
34using System.Threading; 34using System.Threading;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Monitoring;
37using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
38 39
39namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server 40namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index cd401a6..ca956fb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -37,6 +37,7 @@ using OpenMetaverse;
37using log4net; 37using log4net;
38using Nini.Config; 38using Nini.Config;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Monitoring;
40using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
42 43
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 5b22860..47a9cdc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using System.Threading; 31using System.Threading;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Monitoring;
34using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 36using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared; 37using OpenSim.Region.ScriptEngine.Shared;
diff --git a/prebuild.xml b/prebuild.xml
index 7a235e1..9f0168e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -112,6 +112,32 @@
112 </Files> 112 </Files>
113 </Project> 113 </Project>
114 114
115 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
116 <Configuration name="Debug">
117 <Options>
118 <OutputPath>../../../bin/</OutputPath>
119 </Options>
120 </Configuration>
121 <Configuration name="Release">
122 <Options>
123 <OutputPath>../../../bin/</OutputPath>
124 </Options>
125 </Configuration>
126
127 <ReferencePath>../../../bin/</ReferencePath>
128 <Reference name="System"/>
129 <Reference name="System.Core"/>
130 <Reference name="log4net" path="../../../bin/"/>
131 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
132 <Reference name="OpenMetaverse" path="../../../bin/"/>
133 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
134 <Reference name="OpenSim.Framework"/>
135
136 <Files>
137 <Match pattern="*.cs" recurse="true"/>
138 </Files>
139 </Project>
140
115 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> 141 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
116 <Configuration name="Debug"> 142 <Configuration name="Debug">
117 <Options> 143 <Options>
@@ -130,6 +156,7 @@
130 <Reference name="System.Xml"/> 156 <Reference name="System.Xml"/>
131 <Reference name="System.Web"/> 157 <Reference name="System.Web"/>
132 <Reference name="OpenSim.Framework"/> 158 <Reference name="OpenSim.Framework"/>
159 <Reference name="OpenSim.Framework.Monitoring"/>
133 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> 160 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
134 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 161 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
135 <Reference name="XMLRPC" path="../../../../bin/"/> 162 <Reference name="XMLRPC" path="../../../../bin/"/>
@@ -235,31 +262,6 @@
235 </Files> 262 </Files>
236 </Project> 263 </Project>
237 264
238 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
239 <Configuration name="Debug">
240 <Options>
241 <OutputPath>../../../bin/</OutputPath>
242 </Options>
243 </Configuration>
244 <Configuration name="Release">
245 <Options>
246 <OutputPath>../../../bin/</OutputPath>
247 </Options>
248 </Configuration>
249
250 <ReferencePath>../../../bin/</ReferencePath>
251 <Reference name="System"/>
252 <Reference name="System.Core"/>
253 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
254 <Reference name="OpenMetaverse" path="../../../bin/"/>
255 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
256 <Reference name="OpenSim.Framework"/>
257
258 <Files>
259 <Match pattern="*.cs" recurse="true"/>
260 </Files>
261 </Project>
262
263 <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library"> 265 <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
264 <Configuration name="Debug"> 266 <Configuration name="Debug">
265 <Options> 267 <Options>
@@ -2283,10 +2285,11 @@
2283 <Reference name="OpenSim"/> 2285 <Reference name="OpenSim"/>
2284 <Reference name="OpenSim.Framework"/> 2286 <Reference name="OpenSim.Framework"/>
2285 <Reference name="OpenSim.Framework.Communications"/> 2287 <Reference name="OpenSim.Framework.Communications"/>
2288 <Reference name="OpenSim.Framework.Console"/>
2289 <Reference name="OpenSim.Framework.Monitoring"/>
2286 <Reference name="OpenSim.Region.Framework"/> 2290 <Reference name="OpenSim.Region.Framework"/>
2287 <Reference name="OpenSim.Region.CoreModules"/> 2291 <Reference name="OpenSim.Region.CoreModules"/>
2288 <Reference name="OpenSim.Region.Physics.Manager"/> 2292 <Reference name="OpenSim.Region.Physics.Manager"/>
2289 <Reference name="OpenSim.Framework.Console"/>
2290 <Reference name="OpenSim.Services.Interfaces"/> 2293 <Reference name="OpenSim.Services.Interfaces"/>
2291 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2294 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2292 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> 2295 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>