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

start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check

avinationmerge
UbitUmarov 2015-11-10 17:44:53 +00:00
parent b6c3592411
commit 5bfd49404d
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -785,39 +785,54 @@ namespace OpenSim.Region.CoreModules.World.Terrain
m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave); m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
} }
/// <summary> /// <summary>
/// This is used to check to see of any of the terrain is tainted and, if so, schedule /// This is used to check to see of any of the terrain is tainted and, if so, schedule
/// updates for all the presences. /// updates for all the presences.
/// This also checks to see if there are updates that need to be sent for each presence. /// This also checks to see if there are updates that need to be sent for each presence.
/// This is where the logic is to send terrain updates to clients. /// This is where the logic is to send terrain updates to clients.
/// </summary> /// </summary>
/// doing it async, since currently this is 2 heavy for heartbeat
private void EventManager_TerrainCheckUpdates() private void EventManager_TerrainCheckUpdates()
{ {
// this needs fixing Util.FireAndForget(
TerrainData terrData = m_channel.GetTerrainData(); EventManager_TerrainCheckUpdatesAsync);
}
bool shouldTaint = false; object TerrainCheckUpdatesLock = new object();
for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
private void EventManager_TerrainCheckUpdatesAsync(object o)
{
// dont overlap execution
Monitor.TryEnter(TerrainCheckUpdatesLock);
{ {
for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize) // this needs fixing
TerrainData terrData = m_channel.GetTerrainData();
bool shouldTaint = false;
for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
{ {
if (terrData.IsTaintedAt(x, y,true)) for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
{ {
// Found a patch that was modified. Push this flag into the clients. if (terrData.IsTaintedAt(x, y,true))
SendToClients(terrData, x, y); {
shouldTaint = true; // Found a patch that was modified. Push this flag into the clients.
SendToClients(terrData, x, y);
shouldTaint = true;
}
} }
} }
}
// This event also causes changes to be sent to the clients // This event also causes changes to be sent to the clients
CheckSendingPatchesToClients(); CheckSendingPatchesToClients();
// If things changes, generate some events // If things changes, generate some events
if (shouldTaint) if (shouldTaint)
{ {
m_scene.EventManager.TriggerTerrainTainted(); m_scene.EventManager.TriggerTerrainTainted();
m_tainted = true; m_tainted = true;
}
Monitor.Exit(TerrainCheckUpdatesLock);
} }
} }
@ -1083,7 +1098,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize; int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize; int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
if (pups.sendAllcurrentX > limitX || pups.sendAllcurrentY > limitY) if (pups.sendAllcurrentX > limitX && pups.sendAllcurrentY > limitY)
{ {
pups.sendAll = false; pups.sendAll = false;
pups.sendAllcurrentX = 0; pups.sendAllcurrentX = 0;