From ed0e2623b9dd9e12f7660bb067166c294ad8a2ee Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 29 Sep 2018 17:42:12 +0100 Subject: add a few more gc collect in some spots --- OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs | 2 -- OpenSim/Framework/Servers/ServerBase.cs | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs index d26b68a..aba15b0 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs @@ -118,8 +118,6 @@ namespace OpenSim.Framework.Servers.HttpServer /// string StatusDescription { get; set; } -// bool ReuseContext { get; set; } - /// /// Add a header field and content to the response. /// diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 3c2dce8..ff3c80d 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs @@ -31,6 +31,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; +using System.Runtime; using System.Text; using System.Text.RegularExpressions; using System.Threading; @@ -508,7 +509,11 @@ namespace OpenSim.Framework.Servers private void HandleForceGc(string module, string[] args) { Notice("Manually invoking runtime garbage collection"); + GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce; GC.Collect(); + GC.WaitForPendingFinalizers(); + GC.Collect(); + GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default; } public virtual void HandleShow(string module, string[] cmd) -- cgit v1.1