Merge branch 'master' of ssh://MyConnection/var/git/opensim

OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs

@@ -330,5 +330,16 @@ namespace OpenSim.Framework.Communications.Tests
             Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
             Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
         }
+
+        [TearDown]
+        public void TearDown()
+        {
+            try
+            {
+                if (MainServer.Instance != null) MainServer.Instance.Stop();
+            }
+            catch (System.NullReferenceException)
+            { }
+        }
     }
 }

OpenSim/Framework/Communications/Tests/LoginServiceTests.cs

@@ -362,6 +362,16 @@ namespace OpenSim.Framework.Communications.Tests
             //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()");
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            try
+            {
+                if (MainServer.Instance != null) MainServer.Instance.Stop();
+            } catch (NullReferenceException)
+            {}
+        }
+
         public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector
         {
             private List<RegionInfo> m_regionsList = new List<RegionInfo>();

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -1637,13 +1637,20 @@ namespace OpenSim.Framework.Servers.HttpServer
         public void Stop()
         {
             HTTPDRunning = false;
-            m_httpListener2.ExceptionThrown -= httpServerException;
+            try
-            //m_httpListener2.DisconnectHandler = null;
+            {
-            
+                m_httpListener2.ExceptionThrown -= httpServerException;
-            m_httpListener2.LogWriter = null;
+                //m_httpListener2.DisconnectHandler = null;
-            m_httpListener2.RequestReceived -= OnRequest;
 
-            m_httpListener2.Stop();
+                m_httpListener2.LogWriter = null;
+                m_httpListener2.RequestReceived -= OnRequest;
+                m_httpListener2.Stop();
+            } 
+            catch (NullReferenceException)
+            {
+                m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer.");    
+            }
+            
         }
 
         public void RemoveStreamHandler(string httpMethod, string path)

OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

@@ -53,57 +53,6 @@ using OpenSim.Services.Interfaces;
 
 namespace Flotsam.RegionModules.AssetCache
 {
-    /// <summary>
-    /// OpenSim.ini Options:
-    /// -------
-    /// [Modules]
-    ///     AssetCaching = "FlotsamAssetCache"
-    ///
-    /// [AssetCache]
-    ///    ; cache directory can be shared by multiple instances
-    ///    CacheDirectory = /directory/writable/by/OpenSim/instance
-    ///    
-    ///    ; Log level
-    ///    ; 0 - (Error) Errors only
-    ///    ; 1 - (Info)  Hit Rate Stats + Level 0
-    ///    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
-    ///    ;
-    ///    LogLevel = 1
-    /// 
-    ///    ; How often should hit rates be displayed (given in AssetRequests)
-    ///    ; 0 to disable
-    ///    HitRateDisplay = 100
-    /// 
-    ///    ; Set to false for disk cache only.
-    ///    MemoryCacheEnabled = true
-    ///    
-    ///    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    ///    MemoryCacheTimeout = 2
-    ///    
-    ///    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-    ///    ; Specify 0 if you do not want your disk cache to expire
-    ///    FileCacheTimeout = 0
-    ///    
-    ///    ; How often {in hours} should the disk be checked for expired filed
-    ///    ; Specify 0 to disable expiration checking
-    ///    FileCleanupTimer = .166  ;roughly every 10 minutes
-    ///    
-    ///    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 
-    ///    ; long (in miliseconds) to block a request thread while trying to complete 
-    ///    ; writing to disk.
-    ///    WaitOnInprogressTimeout = 3000
-    ///    
-    ///    ; Number of tiers to use for cache directories (current valid range 1 to 3)
-    ///    CacheDirectoryTiers = 1
-    ///    
-    ///    ; Number of letters per path tier, 1 will create 16 directories per tier, 2 - 256, 3 - 4096 and 4 - 65K
-    ///    CacheDirectoryTierLength = 3
-    ///    
-    ///    ; Warning level for cache directory size
-    ///    CacheWarnAt = 30000
-    /// -------
-    /// </summary>
-
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache
     {
@@ -361,7 +310,7 @@ namespace Flotsam.RegionModules.AssetCache
                 {
                     try
                     {
-                        FileStream stream = File.Open(filename, FileMode.Open);
+                        FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
                         BinaryFormatter bformatter = new BinaryFormatter();
 
                         asset = (AssetBase)bformatter.Deserialize(stream);

OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs

@@ -378,6 +378,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            if (MainServer.Instance != null) MainServer.Instance.Stop();
+        }
+
         public static string GetRandomCapsObjectPath()
         {
             TestHelper.InMethod();

OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs

@@ -78,6 +78,17 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            try
+            {
+                if (MainServer.Instance != null) MainServer.Instance.Stop();
+            }
+            catch (NullReferenceException)
+            { }
+        }
+
     }
 
     public class ThreadRunResults

bin/config-include/FlotsamCache.ini.example

@@ -23,6 +23,8 @@
     MemoryCacheEnabled = false
 
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
+    ; increases performance without large memory impact
     MemoryCacheTimeout = 2
 
     ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes

prebuild.xml

@@ -3181,6 +3181,7 @@
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
 
@@ -3245,7 +3246,7 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
-	  <Reference name="System.Core"/>
+	    <Reference name="System.Core"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Data"/>
       <Reference name="OpenMetaverse.dll"/>
@@ -3254,7 +3255,7 @@
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>
-	  <Reference name="OpenSim.Tests.Common"/>
+	    <Reference name="OpenSim.Tests.Common"/>
       <Reference name="log4net.dll"/>
       <Reference name="Mono.Addins.dll" />
       <Reference name="nunit.framework.dll" />
@@ -3397,6 +3398,7 @@
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Tests.Common"/>
       <Reference name="Nini.dll" />
       <Reference name="nunit.framework.dll" />
@@ -3488,6 +3490,7 @@
       <Reference name="OpenSim.Client.Linden"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Region.Framework"/>
@@ -3524,6 +3527,7 @@
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Region.Communications.Local"/>
       <Reference name="OpenSim.Region.Framework"/>
@@ -3585,6 +3589,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Region.Communications.Local"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Region.CoreModules"/>