Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

3 files changed, 62 insertions, 67 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 4a323d8..c705f10 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -596,7 +596,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
 
                         if(IsAtestUpload) // let user know, still showing cost estimation
-                            warning += "Upload will have no cost, for personal test purposes only. Other uses are forbiden. Items may not work on another region";
+                            warning += "Upload will have no cost, for testing purposes only. Other uses are prohibited. Items will not work after 48 hours or on other regions";
 
                         // check funds
                         else
@@ -982,7 +982,7 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
 
                         if(istest)
-                            prim.Description = "For personal testing only. Other uses are forbiden";
+                            prim.Description = "For testing only. Other uses are prohibited";
                         else
                             prim.Description = "";
 
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.ClientStack.Linden
             item.AssetID = asset.FullID;
             if (istest)
             {
-                item.Description = "For personal testing only. Other uses are forbiden";
+                item.Description = "For testing only. Other uses are prohibited";
                 item.Flags = (uint) (InventoryItemFlags.SharedSingleReference);
             }
             else
@@ -1541,7 +1541,7 @@ namespace OpenSim.Region.ClientStack.Linden
             if (m_IsAtestUpload)
             {
                 LLSDAssetUploadError resperror = new LLSDAssetUploadError();
-                resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are forbiden. Item may not work on other region";
+                resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions";
                 resperror.identifier = inv;
 
                 uploadComplete.error = resperror;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 2000279..b16076d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -53,6 +53,14 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")]
     public class GetTextureModule : INonSharedRegionModule
     {
+
+        struct aPollRequest
+        {
+            public PollServiceTextureEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+        }
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
@@ -64,8 +72,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
         private static Thread[] m_workerThreads = null;
 
-        private static OpenMetaverse.BlockingQueue<PollServiceTextureEventArgs> m_queue =
-                new OpenMetaverse.BlockingQueue<PollServiceTextureEventArgs>();
+        private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
+                new OpenMetaverse.BlockingQueue<aPollRequest>();
 
         #region ISharedRegionModule Members
 
@@ -104,7 +112,7 @@ namespace OpenSim.Region.ClientStack.Linden
                             String.Format("TextureWorkerThread{0}", i),
                             ThreadPriority.Normal,
                             false,
-                            true,
+                            false,
                             null,
                             int.MaxValue);
                 }
@@ -129,7 +137,8 @@ namespace OpenSim.Region.ClientStack.Linden
         ~GetTextureModule()
         {
             foreach (Thread t in m_workerThreads)
-                t.Abort();
+                Watchdog.AbortThread(t.ManagedThreadId);
+
         }
 
         private class PollServiceTextureEventArgs : PollServiceEventArgs
@@ -142,7 +151,12 @@ namespace OpenSim.Region.ClientStack.Linden
             private Scene m_scene;
 
             public PollServiceTextureEventArgs(UUID pId, Scene scene) :
-                    base(null, null, null, null, pId, 30000)
+                    base(null, null, null, null, pId, int.MaxValue)
+                // this should never timeout
+                // each request must be processed and return a response
+                // noevents can possible be use for nice shutdown, but not sure now
+                // the execution will provide a proper response even if it fails
+                
             {
                 m_scene = scene;
 
@@ -164,21 +178,24 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 Request = (x, y) =>
                 {
-                    y["RequestID"] = x.ToString();
-                    lock (requests)
-                        requests.Add(y);
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
 
-                    m_queue.Enqueue(this);
+                    m_queue.Enqueue(reqinfo);
                 };
 
+                // this should never happen except possible on shutdown
                 NoEvents = (x, y) =>
                 {
+/*
                     lock (requests)
                     {
                         Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
                         requests.Remove(request);
                     }
-
+*/
                     Hashtable response = new Hashtable();
 
                     response["int_response_code"] = 500;
@@ -191,27 +208,14 @@ namespace OpenSim.Region.ClientStack.Linden
                 };
             }
 
-            public void Process()
+            public void Process(aPollRequest requestinfo)
             {
                 Hashtable response;
-                Hashtable request = null;
 
-                try
-                {
-                    lock (requests)
-                    {
-                        request = requests[0];
-                        requests.RemoveAt(0);
-                    }
-                }
-                catch
-                {
-                    return;
-                }
-
-                UUID requestID = new UUID(request["RequestID"].ToString());
+                UUID requestID = requestinfo.reqID;
 
                 // If the avatar is gone, don't bother to get the texture
+               
                 if (m_scene.GetScenePresence(Id) == null)
                 {
                     response = new Hashtable();
@@ -228,7 +232,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     return;
                 }
 
-                response = m_getTextureHandler.Handle(request);
+                response = m_getTextureHandler.Handle(requestinfo.request);
                 lock (responses)
                     responses[requestID] = response; 
             }
@@ -275,11 +279,10 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
-                PollServiceTextureEventArgs args = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue();
 
-                args.Process();
+                poolreq.thepoll.Process(poolreq);
             }
         }
     }
-
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index f76ea74..0f305b1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -52,6 +52,13 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class WebFetchInvDescModule : INonSharedRegionModule
     {
+        struct aPollRequest
+        {
+            public PollServiceInventoryEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+        }
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
@@ -64,8 +71,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
         private static Thread[] m_workerThreads = null;
 
-        private static OpenMetaverse.BlockingQueue<PollServiceInventoryEventArgs> m_queue =
-                new OpenMetaverse.BlockingQueue<PollServiceInventoryEventArgs>();
+        private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
+                new OpenMetaverse.BlockingQueue<aPollRequest>();
 
         #region ISharedRegionModule Members
 
@@ -131,18 +138,16 @@ namespace OpenSim.Region.ClientStack.Linden
         ~WebFetchInvDescModule()
         {
             foreach (Thread t in m_workerThreads)
-                t.Abort();
+                Watchdog.AbortThread(t.ManagedThreadId);               
         }
 
         private class PollServiceInventoryEventArgs : PollServiceEventArgs
         {
-            private List<Hashtable> requests =
-                    new List<Hashtable>();
             private Dictionary<UUID, Hashtable> responses =
                     new Dictionary<UUID, Hashtable>();
 
             public PollServiceInventoryEventArgs(UUID pId) :
-                    base(null, null, null, null, pId, 30000)
+                    base(null, null, null, null, pId, int.MaxValue)
             {
                 HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
                 GetEvents = (x, y, s) =>
@@ -162,21 +167,23 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 Request = (x, y) =>
                 {
-                    y["RequestID"] = x.ToString();
-                    lock (requests)
-                        requests.Add(y);
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
 
-                    m_queue.Enqueue(this);
+                    m_queue.Enqueue(reqinfo);
                 };
 
                 NoEvents = (x, y) =>
                 {
+/*
                     lock (requests)
                     {
                         Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
                         requests.Remove(request);
                     }
-
+*/
                     Hashtable response = new Hashtable();
 
                     response["int_response_code"] = 500;
@@ -189,24 +196,9 @@ namespace OpenSim.Region.ClientStack.Linden
                 };
             }
 
-            public void Process()
+            public void Process(aPollRequest requestinfo)
             {
-                Hashtable request = null;
-
-                try
-                {
-                    lock (requests)
-                    {
-                        request = requests[0];
-                        requests.RemoveAt(0);
-                    }
-                }
-                catch
-                {
-                    return;
-                }
-
-                UUID requestID = new UUID(request["RequestID"].ToString());
+                UUID requestID = requestinfo.reqID;
 
                 Hashtable response = new Hashtable();
 
@@ -215,7 +207,8 @@ namespace OpenSim.Region.ClientStack.Linden
                 response["keepalive"] = false;
                 response["reusecontext"] = false;
 
-                response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest(request["body"].ToString(), String.Empty, String.Empty, null, null);
+                response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest(
+                    requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null);
 
                 lock (responses)
                     responses[requestID] = response; 
@@ -226,8 +219,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             string capUrl = "/CAPS/" + UUID.Random() + "/";
 
-            // Register this as a poll service
-            // absurd large timeout to tune later to make a bit less than viewer
+            // Register this as a poll service          
             PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID);
             
             args.Type = PollServiceEventArgs.EventType.Inventory;
@@ -263,9 +255,9 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             while (true)
             {
-                PollServiceInventoryEventArgs args = m_queue.Dequeue();
+                aPollRequest poolreq = m_queue.Dequeue();
 
-                args.Process();
+                poolreq.thepoll.Process(poolreq);
             }
         }
     }