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

* Shutting down child agents properly in neighbor regions.

ThreadPoolClientBranch
Teravus Ovares 2008-01-21 23:04:42 +00:00
parent 274d958893
commit 3fe6b2280d
9 changed files with 183 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -175,6 +175,7 @@ namespace OpenSim.Framework.Communications
public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz)
{ {
m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz); m_userService.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
} }
/// <summary> /// <summary>

2
OpenSim/Framework/Communications/IInterRegionCommunications.cs
View File

@ -45,6 +45,6 @@ namespace OpenSim.Framework.Communications
bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId); bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId);
bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID); bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primID);
void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID);
} }
} }

5
OpenSim/Framework/IRegionCommsListener.cs
View File

@ -44,12 +44,14 @@ namespace OpenSim.Framework
public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID); public delegate void AcknowledgePrimCross(ulong regionHandle, LLUUID PrimID);
public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID); public delegate bool CloseAgentConnection(ulong regionHandle, LLUUID agentID);
public delegate bool RegionUp(RegionInfo region); public delegate bool RegionUp(RegionInfo region);
public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
public interface IRegionCommsListener public interface IRegionCommsListener
{ {
@ -64,5 +66,6 @@ namespace OpenSim.Framework
event CloseAgentConnection OnCloseAgentConnection; event CloseAgentConnection OnCloseAgentConnection;
event RegionUp OnRegionUp; event RegionUp OnRegionUp;
event ChildAgentUpdate OnChildAgentUpdate; event ChildAgentUpdate OnChildAgentUpdate;
} }
} }

14
OpenSim/Framework/RegionCommsListener.cs
View File

@ -45,6 +45,7 @@ namespace OpenSim.Framework
public event CloseAgentConnection OnCloseAgentConnection; public event CloseAgentConnection OnCloseAgentConnection;
public event RegionUp OnRegionUp; public event RegionUp OnRegionUp;
public event ChildAgentUpdate OnChildAgentUpdate; public event ChildAgentUpdate OnChildAgentUpdate;
public string debugRegionName = String.Empty; public string debugRegionName = String.Empty;
@ -139,12 +140,15 @@ namespace OpenSim.Framework
return false; return false;
} }
public virtual void TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
{ {
if (OnCloseAgentConnection != null) if (OnCloseAgentConnection != null)
{ {
OnCloseAgentConnection(regionHandle, agentID); OnCloseAgentConnection(regionHandle, agentID);
return true;
} }
return false;
} }
/// <summary> /// <summary>
@ -179,5 +183,13 @@ namespace OpenSim.Framework
return false; return false;
} }
public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
if (OnCloseAgentConnection != null)
return OnCloseAgentConnection(regionHandle, agentID);
return false;
}
} }
} }

25
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -203,7 +203,14 @@ namespace OpenSim.Region.Communications.Local
} }
return mapBlocks; return mapBlocks;
} }
public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
if (m_regionListeners.ContainsKey(regionHandle))
{
return m_regionListeners[regionHandle].TriggerTellRegionToCloseChildConnection(regionHandle, agentID);
}
return false;
}
public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
{ {
@ -267,6 +274,14 @@ namespace OpenSim.Region.Communications.Local
return false; return false;
} }
public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
if (m_regionListeners.ContainsKey(regionHandle))
{
return m_regionListeners[regionHandle].TriggerTellRegionToCloseChildConnection(regionHandle, agentID);
}
return false;
}
/// <summary> /// <summary>
/// </summary> /// </summary>
/// <param name="regionHandle"></param> /// <param name="regionHandle"></param>
@ -328,13 +343,7 @@ namespace OpenSim.Region.Communications.Local
return false; return false;
} }
public void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
if (m_regionListeners.ContainsKey(regionHandle))
{
m_regionListeners[regionHandle].TriggerCloseAgentConnection(regionHandle, agentID);
}
}
public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
{ {

64
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -491,7 +491,8 @@ namespace OpenSim.Region.Communications.OGS1
InterRegionSingleton.Instance.OnPrimGroupNear += TriggerExpectPrimCrossing; InterRegionSingleton.Instance.OnPrimGroupNear += TriggerExpectPrimCrossing;
InterRegionSingleton.Instance.OnRegionUp += TriggerRegionUp; InterRegionSingleton.Instance.OnRegionUp += TriggerRegionUp;
InterRegionSingleton.Instance.OnChildAgentUpdate += TriggerChildAgentUpdate; InterRegionSingleton.Instance.OnChildAgentUpdate += TriggerChildAgentUpdate;
//InterRegionSingleton.Instance.OnRegionUp += RegionUp; InterRegionSingleton.Instance.OnTellRegionToCloseChildConnection += TriggerTellRegionToCloseChildConnection;
} }
#region Methods called by regions in this instance #region Methods called by regions in this instance
@ -959,8 +960,53 @@ namespace OpenSim.Region.Communications.OGS1
} }
} }
public void TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{ {
RegionInfo regInfo = null;
try
{
if (m_localBackend.TriggerTellRegionToCloseChildConnection(regionHandle, agentID))
{
return true;
}
regInfo = RequestNeighbourInfo(regionHandle);
if (regInfo != null)
{
bool retValue = false;
OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
typeof(OGS1InterRegionRemoting),
"tcp://" + regInfo.RemotingAddress +
":" + regInfo.RemotingPort +
"/InterRegions");
if (remObject != null)
{
retValue =
remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID);
}
else
{
Console.WriteLine("remoting object not found");
}
remObject = null;
return true;
}
//TODO need to see if we know about where this region is and use .net remoting
// to inform it.
return false;
}
catch (RemotingException e)
{
MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName +
" " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
//MainLog.Instance.Debug(e.ToString());
return false;
}
catch
{
return false;
}
} }
public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId)
@ -1086,6 +1132,20 @@ namespace OpenSim.Region.Communications.OGS1
} }
} }
public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
try
{
return m_localBackend.TriggerTellRegionToCloseChildConnection(regionHandle, agentID);
}
catch (RemotingException)
{
MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to neighbour to tell it to close a child connection");
return false;
}
}
#endregion #endregion
#endregion #endregion

28
OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
View File

@ -45,6 +45,8 @@ namespace OpenSim.Region.Communications.OGS1
public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID);
public sealed class InterRegionSingleton public sealed class InterRegionSingleton
{ {
private static readonly InterRegionSingleton instance = new InterRegionSingleton(); private static readonly InterRegionSingleton instance = new InterRegionSingleton();
@ -55,6 +57,8 @@ namespace OpenSim.Region.Communications.OGS1
public event PrimGroupArrival OnPrimGroupArrival; public event PrimGroupArrival OnPrimGroupArrival;
public event RegionUp OnRegionUp; public event RegionUp OnRegionUp;
public event ChildAgentUpdate OnChildAgentUpdate; public event ChildAgentUpdate OnChildAgentUpdate;
public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection;
static InterRegionSingleton() static InterRegionSingleton()
@ -123,6 +127,16 @@ namespace OpenSim.Region.Communications.OGS1
} }
return false; return false;
} }
public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
{
if (OnTellRegionToCloseChildConnection != null)
{
return OnTellRegionToCloseChildConnection(regionHandle, agentID);
}
return false;
}
} }
public class OGS1InterRegionRemoting : MarshalByRefObject public class OGS1InterRegionRemoting : MarshalByRefObject
@ -171,6 +185,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
} }
public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying) public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
{ {
try try
@ -215,5 +230,18 @@ namespace OpenSim.Region.Communications.OGS1
return false; return false;
} }
} }
public bool TellRegionToCloseChildConnection(ulong regionHandle, Guid agentID)
{
try
{
return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID));
}
catch (RemotingException)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("INTERREGION", "Remoting Error: Unable to connect to remote region: " + regionHandle.ToString());
return false;
}
}
} }
} }

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1288,6 +1288,7 @@ namespace OpenSim.Region.Environment.Scenes
CommsManager.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle, CommsManager.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle,
avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y,
avatar.AbsolutePosition.Z); avatar.AbsolutePosition.Z);
m_sceneGridService.SendCloseChildAgentConnections(avatar);
} }
} }
catch (NullReferenceException) catch (NullReferenceException)
@ -1389,6 +1390,7 @@ namespace OpenSim.Region.Environment.Scenes
m_sceneGridService.OnCloseAgentConnection += CloseConnection; m_sceneGridService.OnCloseAgentConnection += CloseConnection;
m_sceneGridService.OnRegionUp += OtherRegionUp; m_sceneGridService.OnRegionUp += OtherRegionUp;
m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
m_sceneGridService.KillObject = SendKillObject; m_sceneGridService.KillObject = SendKillObject;
@ -1509,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
/// <param name="regionHandle"></param> /// <param name="regionHandle"></param>
/// <param name="agentID"></param> /// <param name="agentID"></param>
public void CloseConnection(ulong regionHandle, LLUUID agentID) public bool CloseConnection(ulong regionHandle, LLUUID agentID)
{ {
if (regionHandle == m_regionHandle) if (regionHandle == m_regionHandle)
{ {
@ -1527,8 +1529,10 @@ namespace OpenSim.Region.Environment.Scenes
// Tell a single agent to disconnect from the region. // Tell a single agent to disconnect from the region.
libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket) PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator); libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket) PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator);
presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task); presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Task);
presence.ControllingClient.Close(true);
} }
} }
return true;
} }
/// <summary> /// <summary>

64
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -51,6 +51,7 @@ namespace OpenSim.Region.Environment.Scenes
public event PrimCrossing OnPrimCrossingIntoRegion; public event PrimCrossing OnPrimCrossingIntoRegion;
public event RegionUp OnRegionUp; public event RegionUp OnRegionUp;
public event ChildAgentUpdate OnChildAgentUpdate; public event ChildAgentUpdate OnChildAgentUpdate;
public KillObjectDelegate KillObject; public KillObjectDelegate KillObject;
@ -86,6 +87,7 @@ namespace OpenSim.Region.Environment.Scenes
regionCommsHost.OnCloseAgentConnection += CloseConnection; regionCommsHost.OnCloseAgentConnection += CloseConnection;
regionCommsHost.OnRegionUp += newRegionUp; regionCommsHost.OnRegionUp += newRegionUp;
regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate; regionCommsHost.OnChildAgentUpdate += ChildAgentUpdate;
} }
else else
{ {
@ -160,12 +162,15 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
protected void CloseConnection(ulong regionHandle, LLUUID agentID) protected bool CloseConnection(ulong regionHandle, LLUUID agentID)
{ {
MainLog.Instance.Verbose("INTERREGION", "Incoming Agent Close Request for agent: " + agentID.ToString());
if (OnCloseAgentConnection != null) if (OnCloseAgentConnection != null)
{ {
OnCloseAgentConnection(regionHandle, agentID); return OnCloseAgentConnection(regionHandle, agentID);
} }
return false;
} }
#endregion #endregion
@ -366,6 +371,50 @@ namespace OpenSim.Region.Environment.Scenes
d); d);
} }
public delegate void SendCloseChildAgentDelegate( ScenePresence presence);
/// <summary>
/// This informs all neighboring regions about the settings of it's child agent.
/// Calls an asynchronous method to do so.. so it doesn't lag the sim.
///
/// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
///
/// </summary>
private void SendCloseChildAgentAsync(ScenePresence presence)
{
foreach (ulong regionHandle in presence.KnownChildRegions)
{
bool regionAccepted = m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
if (regionAccepted)
{
MainLog.Instance.Notice("INTERGRID", "Completed sending agent Close agent Request to neighbor");
presence.RemoveNeighbourRegion(regionHandle);
}
else
{
MainLog.Instance.Notice("INTERGRID", "Failed sending agent Close agent Request to neighbor");
}
}
}
private void SendCloseChildAgentCompleted(IAsyncResult iar)
{
SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
icon.EndInvoke(iar);
}
public void SendCloseChildAgentConnections(ScenePresence presence)
{
// This assumes that we know what our neighbors are.
SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
d.BeginInvoke(presence,
SendCloseChildAgentCompleted,
d);
}
/// <summary> /// <summary>
/// Helper function to request neighbors from grid-comms /// Helper function to request neighbors from grid-comms
@ -454,7 +503,7 @@ namespace OpenSim.Region.Environment.Scenes
uint oldRegionY = (((uint)(m_regionInfo.RegionHandle)) >> 8); uint oldRegionY = (((uint)(m_regionInfo.RegionHandle)) >> 8);
if (Util.fast_distance2d((int)(newRegionX - oldRegionX), (int)(newRegionY - oldRegionY)) > 3) if (Util.fast_distance2d((int)(newRegionX - oldRegionX), (int)(newRegionY - oldRegionY)) > 3)
{ {
CloseChildAgentConnections(avatar); SendCloseChildAgentConnections(avatar);
} }
} }
else else
@ -481,15 +530,6 @@ namespace OpenSim.Region.Environment.Scenes
return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical); return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);
} }
public void CloseChildAgentConnections(ScenePresence presence)
{
foreach (ulong regionHandle in presence.KnownChildRegions)
{
m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle,
presence.ControllingClient.AgentId);
presence.RemoveNeighbourRegion(regionHandle);
}
}
public Dictionary<string, string> GetGridSettings() public Dictionary<string, string> GetGridSettings()
{ {