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

Some changes to remove some of the direct calls to CommsManager from Scene, so that they now go through the SceneCommunicationService. As a small step towards the day we can kill the CommsManager (YAY!)

ThreadPoolClientBranch
MW 2008-02-16 11:55:09 +00:00
parent e8225f2f81
commit 694dff3b70
5 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -199,7 +199,8 @@ namespace OpenSim.Region.ClientStack
try try
{ {
packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer); packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
} }
catch (Exception e) catch (Exception e)
{ {

2
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -138,7 +138,7 @@ namespace OpenSim.Region.Communications.Local
response.SimAddress = reg.ExternalEndPoint.Address.ToString(); response.SimAddress = reg.ExternalEndPoint.Address.ToString();
response.SimPort = (uint) reg.ExternalEndPoint.Port; response.SimPort = (uint) reg.ExternalEndPoint.Port;
response.RegionX = reg.RegionLocX; response.RegionX = reg.RegionLocX;
response.RegionY = reg.RegionLocY; response.RegionY = reg.RegionLocY ;
response.SeedCapability = "http://" + reg.ExternalHostName + ":" + response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";

2
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes
//EventManager.TriggerAvatarPickerRequest(); //EventManager.TriggerAvatarPickerRequest();
List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>(); List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>();
AvatarResponses = CommsManager.GenerateAgentPickerRequestResponse(RequestID, query); AvatarResponses = m_sceneGridService.GenerateAgentPickerRequestResponse(RequestID, query);
AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet

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

@ -900,7 +900,7 @@ namespace OpenSim.Region.Environment.Scenes
public void ExportWorldMap(string fileName) public void ExportWorldMap(string fileName)
{ {
List<MapBlockData> mapBlocks = List<MapBlockData> mapBlocks =
CommsManager.GridService.RequestNeighbourMapBlocks((int)(RegionInfo.RegionLocX - 9), m_sceneGridService.RequestNeighbourMapBlocks((int)(RegionInfo.RegionLocX - 9),
(int)(RegionInfo.RegionLocY - 9), (int)(RegionInfo.RegionLocY - 9),
(int)(RegionInfo.RegionLocX + 9), (int)(RegionInfo.RegionLocX + 9),
(int)(RegionInfo.RegionLocY + 9)); (int)(RegionInfo.RegionLocY + 9));
@ -1461,7 +1461,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
m_innerScene.removeUserCount(true); m_innerScene.removeUserCount(true);
CommsManager.LogOffUser(agentID, RegionInfo.RegionID, RegionInfo.RegionHandle, m_sceneGridService.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); m_sceneGridService.SendCloseChildAgentConnections(avatar);
@ -1530,7 +1530,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
// Remove client agent from profile, so new logins will work // Remove client agent from profile, so new logins will work
CommsManager.UserService.clearUserAgent(agentID); m_sceneGridService.ClearUserAgent(agentID);
//m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
@ -1983,24 +1983,24 @@ namespace OpenSim.Region.Environment.Scenes
public virtual void StoreAddFriendship(LLUUID ownerID, LLUUID friendID, uint perms) public virtual void StoreAddFriendship(LLUUID ownerID, LLUUID friendID, uint perms)
{ {
// TODO: m_sceneGridService.DoStuff; // TODO: m_sceneGridService.DoStuff;
CommsManager.AddNewUserFriend(ownerID, friendID, perms); m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
} }
public virtual void StoreUpdateFriendship(LLUUID ownerID, LLUUID friendID, uint perms) public virtual void StoreUpdateFriendship(LLUUID ownerID, LLUUID friendID, uint perms)
{ {
// TODO: m_sceneGridService.DoStuff; // TODO: m_sceneGridService.DoStuff;
CommsManager.UpdateUserFriendPerms(ownerID, friendID, perms); m_sceneGridService.UpdateUserFriendPerms(ownerID, friendID, perms);
} }
public virtual void StoreRemoveFriendship(LLUUID ownerID, LLUUID ExfriendID) public virtual void StoreRemoveFriendship(LLUUID ownerID, LLUUID ExfriendID)
{ {
// TODO: m_sceneGridService.DoStuff; // TODO: m_sceneGridService.DoStuff;
CommsManager.RemoveUserFriend(ownerID, ExfriendID); m_sceneGridService.RemoveUserFriend(ownerID, ExfriendID);
} }
public virtual List<FriendListItem> StoreGetFriendsForUser(LLUUID ownerID) public virtual List<FriendListItem> StoreGetFriendsForUser(LLUUID ownerID)
{ {
// TODO: m_sceneGridService.DoStuff; // TODO: m_sceneGridService.DoStuff;
return CommsManager.GetUserFriendList(ownerID); return m_sceneGridService.GetUserFriendList(ownerID);
} }
public void AddPacketStats(int inPackets, int outPackets, int unAckedBytes) public void AddPacketStats(int inPackets, int outPackets, int unAckedBytes)

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

@ -554,5 +554,45 @@ namespace OpenSim.Region.Environment.Scenes
{ {
return m_commsProvider.GridService.GetGridSettings(); return m_commsProvider.GridService.GetGridSettings();
} }
public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz)
{
m_commsProvider.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
}
public void ClearUserAgent(LLUUID avatarID)
{
m_commsProvider.UserService.clearUserAgent(avatarID);
}
public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms)
{
m_commsProvider.AddNewUserFriend(friendlistowner, friend, perms);
}
public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
{
m_commsProvider.UpdateUserFriendPerms(friendlistowner, friend, perms);
}
public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
{
m_commsProvider.RemoveUserFriend(friendlistowner, friend);
}
public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
{
return m_commsProvider.GetUserFriendList(friendlistowner);
}
public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
{
return m_commsProvider.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
}
public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
{
return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query);
}
} }
} }