ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Saving estate state is really slow (relatively) and it gets

Browse Source 
completely rewritten every time a region starts up. This
makes the data write only when the data was not already
read from the database.

There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
This commit is contained in:
Mic Bowman
2012-05-10 09:08:40 -07:00
parent d8a78374aa
commit de44734fe9
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@@ -122,9 +122,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
Thread.CurrentThread.ManagedThreadId.ToString() +
")");
m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
regionsToLoad[i].EstateSettings.Save();
if (changed)
regionsToLoad[i].EstateSettings.Save();
if (scene != null)
{

5
OpenSim/Region/Application/OpenSim.cs
View File

@@ -618,10 +618,11 @@ namespace OpenSim
return;
}
PopulateRegionEstateInfo(regInfo);
bool changed = PopulateRegionEstateInfo(regInfo);
IScene scene;
CreateRegion(regInfo, true, out scene);
regInfo.EstateSettings.Save();
if (changed)
regInfo.EstateSettings.Save();
}
/// <summary>

12
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -977,13 +977,13 @@ namespace OpenSim
/// Load the estate information for the provided RegionInfo object.
/// </summary>
/// <param name="regInfo"></param>
public void PopulateRegionEstateInfo(RegionInfo regInfo)
public bool PopulateRegionEstateInfo(RegionInfo regInfo)
{
if (EstateDataService != null)
regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
if (regInfo.EstateSettings.EstateID != 0)
return;
return false; // estate info in the database did not change
m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
@@ -1018,7 +1018,7 @@ namespace OpenSim
}
if (defaultEstateJoined)
return;
return true; // need to update the database
else
m_log.ErrorFormat(
"[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
@@ -1080,8 +1080,10 @@ namespace OpenSim
MainConsole.Instance.Output("Joining the estate failed. Please try again.");
}
}
}
}
}
return true; // need to update the database
}
}
public class OpenSimConfigSource