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

* Fix Inconsistent line ending style on Scene

mysql-performance
Teravus Ovares (Dan Olivares) 2009-12-01 10:48:11 -05:00
parent 7a2e8cb05f
commit 75e28b3a16
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1159,8 +1159,8 @@ namespace OpenSim.Region.Framework.Scenes
while (!shuttingdown)
{
TimeSpan SinceLastFrame = DateTime.UtcNow - m_lastupdate;
physicsFPS = 0f;
physicsFPS = 0f;
maintc = Util.EnvironmentTickCount();
int tmpFrameMS = maintc;
tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
@ -1189,8 +1189,8 @@ namespace OpenSim.Region.Framework.Scenes
physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2);
if (m_frame % m_update_entitymovement == 0)
m_sceneGraph.UpdateScenePresenceMovement();
m_sceneGraph.UpdateScenePresenceMovement();
int tmpPhysicsMS = Util.EnvironmentTickCount();
if (m_frame % m_update_physics == 0)
{
@ -1198,49 +1198,49 @@ namespace OpenSim.Region.Framework.Scenes
physicsFPS = m_sceneGraph.UpdatePhysics(Math.Max(SinceLastFrame.TotalSeconds, m_timespan));
if (SynchronizeScene != null)
SynchronizeScene(this);
}
}
physicsMS = Util.EnvironmentTickCountSubtract(tmpPhysicsMS);
// Delete temp-on-rez stuff
if (m_frame % m_update_backup == 0)
{
{
int tmpTempOnRezMS = Util.EnvironmentTickCount();
CleanTempObjects();
CleanTempObjects();
tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpTempOnRezMS);
}
if (RegionStatus != RegionStatus.SlaveScene)
{
if (m_frame % m_update_events == 0)
{
{
int evMS = Util.EnvironmentTickCount();
UpdateEvents();
UpdateEvents();
eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
}
if (m_frame % m_update_backup == 0)
{
{
int backMS = Util.EnvironmentTickCount();
UpdateStorageBackup();
UpdateStorageBackup();
backupMS = Util.EnvironmentTickCountSubtract(backMS);
}
if (m_frame % m_update_terrain == 0)
{
{
int terMS = Util.EnvironmentTickCount();
UpdateTerrain();
UpdateTerrain();
terrainMS = Util.EnvironmentTickCountSubtract(terMS);
}
if (m_frame % m_update_land == 0)
{
{
int ldMS = Util.EnvironmentTickCount();
UpdateLand();
UpdateLand();
landMS = Util.EnvironmentTickCountSubtract(ldMS);
}
}
frameMS = Util.EnvironmentTickCountSubtract(tmpFrameMS);
otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
lastCompletedFrame = Util.EnvironmentTickCount();
// if (m_frame%m_update_avatars == 0)
@ -1293,8 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes
finally
{
m_lastupdate = DateTime.UtcNow;
}
}
maintc = Util.EnvironmentTickCountSubtract(maintc);
maintc = (int)(m_timespan * 1000) - maintc;
@ -2581,8 +2581,8 @@ namespace OpenSim.Region.Framework.Scenes
sp.IsChildAgent = false;
Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
}
}
}
m_LastLogin = Util.EnvironmentTickCount();
EventManager.TriggerOnNewClient(client);
}
@ -4650,15 +4650,15 @@ namespace OpenSim.Region.Framework.Scenes
// 3 = We have seen a new user enter within the past 4 minutes
// which can be seen as positive confirmation of sim health
//
int health=1; // Start at 1, means we're up
int health=1; // Start at 1, means we're up
if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000)
health+=1;
else
return health;
// A login in the last 4 mins? We can't be doing too badly
//
//
if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000)
health++;
else
@ -4855,8 +4855,8 @@ namespace OpenSim.Region.Framework.Scenes
private void CheckHeartbeat()
{
if (m_firstHeartbeat)
return;
return;
if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000)
StartTimer();
}