ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

add a few more gc collect in some spots

Browse Source
This commit is contained in:
UbitUmarov
2018-09-29 17:42:12 +01:00
parent 5a0c9c2fcf
commit ed0e2623b9
8 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
View File

@@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Reflection;
using System.Runtime;
using System.Text.RegularExpressions;
using System.Threading;
using System.Xml;
@@ -216,6 +217,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
CloseArchive(e.Message);
throw;
}
GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
GC.Collect();
GC.WaitForPendingFinalizers();
GC.Collect();
GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default;
}
private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids,
@@ -282,6 +289,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
assetGatherer.GatherAll();
GC.Collect();
int errors = assetGatherer.FailedUUIDs.Count;
m_log.DebugFormat(
"[ARCHIVER]: {0} region scene objects to save reference {1} possible assets",
@@ -313,6 +321,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
Save(scene, sceneObjects, regionDir);
GC.Collect();
}
/// <summary>

7
OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
View File

@@ -133,6 +133,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_timeOutTimer .AutoReset = false;
m_timeOutTimer.Elapsed += OnTimeout;
m_timeout = false;
int gccontrol = 0;
foreach (KeyValuePair<UUID, sbyte> kvp in m_uuids)
{
@@ -161,6 +162,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_foundAssetUuids.Add(asset.FullID);
m_assetsArchiver.WriteAsset(PostProcess(asset));
if(++gccontrol > 5000)
{
gccontrol = 0;
GC.Collect();
}
}
catch (Exception e)
@@ -180,6 +186,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_log.DebugFormat("[ARCHIVER]: Successfully added {0} assets ({1} of total possible assets requested were not found, were damaged or were not assets)",
m_foundAssetUuids.Count, totalerrors);
GC.Collect();
PerformAssetsRequestCallback(m_timeout);
}

6
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@@ -31,6 +31,7 @@ using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Reflection;
using System.Runtime;
using CSJ2K;
using Nini.Config;
@@ -261,8 +262,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
m_colors.Clear();
m_warpTextures.Clear();
GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
GC.Collect();
// m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()");
GC.WaitForPendingFinalizers();
GC.Collect();
GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default;
return bitmap;
}