OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Reduced sleep durations in a number of files.

0.6.0-stable
Adam Frisby 2008-05-08 04:47:38 +00:00
parent 80cbd468ea
commit ba8ff761c0
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/MSSQL/MSSQLDataStore.cs
View File

@ -431,12 +431,6 @@ namespace OpenSim.Data.MSSQL
public void StoreLandObject(ILandObject parcel) public void StoreLandObject(ILandObject parcel)
{ {
// Instance.StoreLandObject(parcel, regionUUID);
// Does the new locking fix it?
// m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds to avoid others writing to table while we hold a dataset of it. (Someone please fix! :))");
// System.Threading.Thread.Sleep(2500 + rnd.Next(0, 1000));
lock (m_dataSet) lock (m_dataSet)
{ {
DataTable land = m_landTable; DataTable land = m_landTable;

5
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -268,12 +268,13 @@ namespace OpenSim.Framework.Communications.Cache
// inventory failure. // inventory failure.
// //
// This is a crude way of dealing with that by retrying the lookup. // This is a crude way of dealing with that by retrying the lookup.
//BUG: This should be replaced with a async event.
if (!userProfile.HasInventory) if (!userProfile.HasInventory)
{ {
int attempts = 5; int attempts = 5;
while (attempts-- > 0) while (attempts-- > 0)
{ {
Thread.Sleep(3000); Thread.Sleep(500);
if (userProfile.HasInventory) if (userProfile.HasInventory)
{ {
@ -369,7 +370,7 @@ namespace OpenSim.Framework.Communications.Cache
"[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}", "[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}",
attempts, folderID, agentID); attempts, folderID, agentID);
Thread.Sleep(3000); Thread.Sleep(500);
if (userProfile.HasInventory) if (userProfile.HasInventory)
{ {

7
OpenSim/Grid/InventoryServer/GridInventoryService.cs
View File

@ -60,9 +60,6 @@ namespace OpenSim.Grid.InventoryServer
LLUUID userID = new LLUUID(rawUserID); LLUUID userID = new LLUUID(rawUserID);
m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
// uncomment me to simulate an overloaded inventory server
//Thread.Sleep(18000);
InventoryCollection invCollection = new InventoryCollection(); InventoryCollection invCollection = new InventoryCollection();
@ -114,9 +111,7 @@ namespace OpenSim.Grid.InventoryServer
/// <param name="rawUserID"></param> /// <param name="rawUserID"></param>
/// <returns></returns> /// <returns></returns>
public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
{ {
//Thread.Sleep(10000);
LLUUID userID = new LLUUID(rawUserID); LLUUID userID = new LLUUID(rawUserID);
return GetInventorySkeleton(userID); return GetInventorySkeleton(userID);
} }

3
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@ -100,7 +100,8 @@ namespace OpenSim.Region.Modules.AvatarFactory
} }
else else
{ {
Thread.Sleep(5000); //why is this here? // BUG: !? (Reduced from 5000 to 500 by Adam)
Thread.Sleep(500); //why is this here?
//this is the first thread to request this appearance //this is the first thread to request this appearance
//so let it check the db and if not found then create a default appearance //so let it check the db and if not found then create a default appearance

3
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1103,9 +1103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
if (prim.prim_geom != (IntPtr)0) if (prim.prim_geom != (IntPtr)0)
{ {
//System.Threading.Thread.Sleep(20);
prim.ResetTaints(); prim.ResetTaints();