aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-26 20:36:33 +0000
committerJustin Clark-Casey (justincc)2014-03-26 20:36:33 +0000
commit6c447f892efa036927f4fa1c23a4c4732f15fe4e (patch)
tree63e149e21226464c6053ff80abdec70bc6a03c9b /OpenSim
parentFix extra physics params MSSQL migration (version 39). (diff)
parent- Increased the threadpool timeout to 10 minutes (diff)
downloadopensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.zip
opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.gz
opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.bz2
opensim-SC_OLD-6c447f892efa036927f4fa1c23a4c4732f15fe4e.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs6
-rw-r--r--OpenSim/Framework/Util.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs4
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 7d48516..a750d8d 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -560,7 +560,7 @@ namespace OpenSim.Groups
560 560
561 // so we have the list of urls to send the notice to 561 // so we have the list of urls to send the notice to
562 // this may take a long time... 562 // this may take a long time...
563 Util.FireAndForget(delegate 563 Util.RunThreadNoTimeout(delegate
564 { 564 {
565 foreach (string u in urls) 565 foreach (string u in urls)
566 { 566 {
@@ -571,7 +571,7 @@ namespace OpenSim.Groups
571 hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID)); 571 hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID));
572 } 572 }
573 } 573 }
574 }); 574 }, "AddGroupNotice", null);
575 575
576 return true; 576 return true;
577 } 577 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ce4af8b..c7a7341 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2031,7 +2031,7 @@ namespace OpenSim.Framework
2031 // Maps (ThreadFunc number -> Thread) 2031 // Maps (ThreadFunc number -> Thread)
2032 private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>(); 2032 private static ConcurrentDictionary<long, ThreadInfo> activeThreads = new ConcurrentDictionary<long, ThreadInfo>();
2033 2033
2034 private static readonly int THREAD_TIMEOUT = 60 * 1000; 2034 private static readonly int THREAD_TIMEOUT = 10 * 60 * 1000; // 10 minutes
2035 2035
2036 /// <summary> 2036 /// <summary>
2037 /// Finds threads in the main thread pool that have timed-out, and aborts them. 2037 /// Finds threads in the main thread pool that have timed-out, and aborts them.
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index b270de9..c7bd3d0 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -963,10 +963,10 @@ namespace OpenSim.Region.CoreModules.Asset
963 case "assets": 963 case "assets":
964 con.Output("Ensuring assets are cached for all scenes."); 964 con.Output("Ensuring assets are cached for all scenes.");
965 965
966 Util.FireAndForget(delegate { 966 Util.RunThreadNoTimeout(delegate {
967 int assetReferenceTotal = TouchAllSceneAssets(true); 967 int assetReferenceTotal = TouchAllSceneAssets(true);
968 con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal); 968 con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal);
969 }); 969 }, "TouchAllSceneAssets", null);
970 970
971 break; 971 break;
972 972