diff options
author | Tedd Hansen | 2008-12-05 12:42:32 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-12-05 12:42:32 +0000 |
commit | 081383c8cb8ad8075872df94e05c19409a6bd3cb (patch) | |
tree | ecc430c779756e44dd63a1511a2ac72e9c98b125 | |
parent | Mantis #2350 (diff) | |
download | opensim-SC_OLD-081383c8cb8ad8075872df94e05c19409a6bd3cb.zip opensim-SC_OLD-081383c8cb8ad8075872df94e05c19409a6bd3cb.tar.gz opensim-SC_OLD-081383c8cb8ad8075872df94e05c19409a6bd3cb.tar.bz2 opensim-SC_OLD-081383c8cb8ad8075872df94e05c19409a6bd3cb.tar.xz |
Garbage Collector
* Enabled GC server
* Enabled concurrent collections
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 | ||||
-rwxr-xr-x | bin/OpenSim.32BitLaunch.exe | bin | 5632 -> 5632 bytes | |||
-rw-r--r-- | bin/OpenSim.32BitLaunch.exe.config | 4 | ||||
-rw-r--r-- | bin/OpenSim.32BitLaunch.pdb | bin | 11776 -> 11776 bytes | |||
-rw-r--r-- | bin/OpenSim.exe.config | 4 |
5 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 64989ea..9213c61 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Runtime; | ||
34 | using System.Threading; | 35 | using System.Threading; |
35 | using OpenMetaverse; | 36 | using OpenMetaverse; |
36 | using log4net; | 37 | using log4net; |
@@ -91,6 +92,9 @@ namespace OpenSim | |||
91 | m_log.Info("========================= STARTING OPENSIM ========================="); | 92 | m_log.Info("========================= STARTING OPENSIM ========================="); |
92 | m_log.Info("===================================================================="); | 93 | m_log.Info("===================================================================="); |
93 | m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (ConfigurationSettings.Standalone ? "sandbox" : "grid")); | 94 | m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (ConfigurationSettings.Standalone ? "sandbox" : "grid")); |
95 | m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); | ||
96 | m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString()); | ||
97 | m_log.InfoFormat("[OPENSIM MAIN]: GC Latency Mode: {0}", GCSettings.LatencyMode.ToString()); | ||
94 | 98 | ||
95 | m_console = new ConsoleBase("Region", this); | 99 | m_console = new ConsoleBase("Region", this); |
96 | MainConsole.Instance = m_console; | 100 | MainConsole.Instance = m_console; |
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe index a028deb..cc73c8b 100755 --- a/bin/OpenSim.32BitLaunch.exe +++ b/bin/OpenSim.32BitLaunch.exe | |||
Binary files differ | |||
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 70d179f..1a8267c 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config | |||
@@ -1,5 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <configuration> | 2 | <configuration> |
3 | <runtime> | ||
4 | <gcConcurrent enabled="true" /> | ||
5 | <gcServer enabled="true" /> | ||
6 | </runtime> | ||
3 | <configSections> | 7 | <configSections> |
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | 8 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> |
5 | </configSections> | 9 | </configSections> |
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb index 0af0597..5083dd5 100644 --- a/bin/OpenSim.32BitLaunch.pdb +++ b/bin/OpenSim.32BitLaunch.pdb | |||
Binary files differ | |||
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 8548986..fa42e2c 100644 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -1,5 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <configuration> | 2 | <configuration> |
3 | <runtime> | ||
4 | <gcConcurrent enabled="true" /> | ||
5 | <gcServer enabled="true" /> | ||
6 | </runtime> | ||
3 | <configSections> | 7 | <configSections> |
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | 8 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> |
5 | </configSections> | 9 | </configSections> |