From 119cf80e13e9fccea30147e3274f5d44958248b2 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 26 Oct 2009 15:52:59 -0700
Subject: Added calls to GC.AddMemoryPressure() when unmanaged memory is
 allocated for ODE (helps the GC make better scheduling choices), and a call
 to GC.Collect() right before logins are enabled for a region. Although this
 doesn't change actual memory usage, it improves the reported usage from
 OpenSim and the operating system

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 5 +++++
 OpenSim/Region/Physics/Meshing/Mesh.cs   | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 95d69a1..4776bed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1107,6 +1107,11 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     if (loginsdisabled && (m_frame > 20))
                     {
+                        // In 99.9% of cases it is a bad idea to manually force garbage collection. However,
+                        // this is a rare case where we know we have just went through a long cycle of heap
+                        // allocations, and there is no more work to be done until someone logs in
+                        GC.Collect();
+
                         m_log.Debug("[REGION]: Enabling Logins");
                         loginsdisabled = false;
                     }
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index 4c3cf33..e8a3e19 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -174,6 +174,9 @@ namespace OpenSim.Region.Physics.Meshing
 
             float[] result = getVertexListAsFloat();
             m_pinnedVertexes = GCHandle.Alloc(result, GCHandleType.Pinned);
+            // Inform the garbage collector of this unmanaged allocation so it can schedule
+            // the next GC round more intelligently
+            GC.AddMemoryPressure(Buffer.ByteLength(result));
 
             return result;
         }
@@ -223,6 +226,9 @@ namespace OpenSim.Region.Physics.Meshing
         
             int[] result = getIndexListAsInt();
             m_pinnedIndex = GCHandle.Alloc(result, GCHandleType.Pinned);
+            // Inform the garbage collector of this unmanaged allocation so it can schedule
+            // the next GC round more intelligently
+            GC.AddMemoryPressure(Buffer.ByteLength(result));
 
             return result;
         }
-- 
cgit v1.1