From 9ec55df9880194e6e004fdde96ebdf1a196f3fca Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Oct 2009 01:51:27 +0100
Subject: Mark new version

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 9f98310..812abd1 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.8";
+        private const string VERSION_NUMBER = "0.6.8-mel_t";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-- 
cgit v1.1


From 8a336c6860d66b9fbba6922c32e7a57fd355c57e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Oct 2009 02:28:53 +0100
Subject: Add MaxPoolThreads in startup to limit the size of the thread pool
 used for FireAndForget. This lets us limit concurrency to make OpenSim play
 nice

---
 OpenSim/Framework/Util.cs | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index d5ae3b7..9dfb75e 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -41,12 +41,14 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using BclExtras;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
+using Amib.Threading;
 
 namespace OpenSim.Framework
 {
@@ -55,6 +57,8 @@ namespace OpenSim.Framework
     /// </summary>
     public class Util
     {
+        private static SmartThreadPool m_ThreadPool = null;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static uint nextXferID = 5000;
@@ -1293,22 +1297,28 @@ namespace OpenSim.Framework
             System.Threading.ThreadPool.UnsafeQueueUserWorkItem(callback, null);
         }
 
-        public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
+        public static void SetMaxThreads(int maxThreads)
         {
-            //FireAndForgetWrapper wrapper = Singleton.GetInstance<FireAndForgetWrapper>();
-            //wrapper.FireAndForget(callback, obj);
-            System.Threading.ThreadPool.UnsafeQueueUserWorkItem(callback, obj);
-        }
+            STPStartInfo startInfo = new STPStartInfo();
+            startInfo.IdleTimeout = 2000; // 2 seconds
+            startInfo.MaxWorkerThreads = maxThreads;
+            startInfo.MinWorkerThreads = 5;
+            startInfo.StackSize = 524288;
+            startInfo.ThreadPriority = ThreadPriority.Normal;
 
-        /*private static void EndFireAndForget(IAsyncResult ar)
-        {
-            System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
+            startInfo.StartSuspended = false;
 
-            try { callback.EndInvoke(ar); }
-            catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
+            m_ThreadPool = new SmartThreadPool(startInfo);
+        }
 
-            ar.AsyncWaitHandle.Close();
-        }*/
+        public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
+        {
+            m_ThreadPool.QueueWorkItem(new WorkItemCallback(delegate(object o)
+                {
+                    callback(o);
+                    return null;
+                }), obj);
+        }
 
         #endregion FireAndForget Threading Pattern
     }
-- 
cgit v1.1


From 8ce4fd7234bd460652f6159a3b7a21d2bebee05d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Oct 2009 04:02:26 +0100
Subject: Reduce the default pool threads to 15 (from 30) and the minimum from
 5 to 2

---
 OpenSim/Framework/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 9dfb75e..7dde6dd 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1302,7 +1302,7 @@ namespace OpenSim.Framework
             STPStartInfo startInfo = new STPStartInfo();
             startInfo.IdleTimeout = 2000; // 2 seconds
             startInfo.MaxWorkerThreads = maxThreads;
-            startInfo.MinWorkerThreads = 5;
+            startInfo.MinWorkerThreads = 2;
             startInfo.StackSize = 524288;
             startInfo.ThreadPriority = ThreadPriority.Normal;
 
-- 
cgit v1.1