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

remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages

dsg
Robert Adams 2011-01-03 12:21:38 -08:00
parent be2af26231
commit ae8f8d60a6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
View File

@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
else else
{ {
sp.IsSyncedAvatar = true; sp.IsSyncedAvatar = true;
m_log.DebugFormat("{0}: Setting avatar local ID to {1}", LogHeader, localID); m_log.DebugFormat("{0}: Setting avatar local ID to {1}", LogHeader(), localID);
sp.LocalId = localID; sp.LocalId = localID;
if (sp.PhysicsActor != null) if (sp.PhysicsActor != null)
{ {
@ -978,7 +978,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public void HandleAgentRequestSit(object sender, UUID agentID, UUID targetID, Vector3 offset) public void HandleAgentRequestSit(object sender, UUID agentID, UUID targetID, Vector3 offset)
{ {
m_log.DebugFormat("{0} HandleAgentRequestSit for {1}", LogHeader(), agentID.ToString()); // m_log.DebugFormat("{0} HandleAgentRequestSit for {1}", LogHeader(), agentID.ToString());
OSDMap data = new OSDMap(3); OSDMap data = new OSDMap(3);
data["agentID"] = OSD.FromUUID(agentID); data["agentID"] = OSD.FromUUID(agentID);
data["targetID"] = OSD.FromUUID(targetID); data["targetID"] = OSD.FromUUID(targetID);
@ -988,7 +988,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
{ {
m_log.DebugFormat("{0} HandleAgentSit for {1}", LogHeader(), agentID.ToString()); // m_log.DebugFormat("{0} HandleAgentSit for {1}", LogHeader(), agentID.ToString());
OSDMap data = new OSDMap(1); OSDMap data = new OSDMap(1);
data["agentID"] = OSD.FromUUID(agentID); data["agentID"] = OSD.FromUUID(agentID);
Send(new RegionSyncMessage(RegionSyncMessage.MsgType.AgentSit, OSDParser.SerializeJsonString(data))); Send(new RegionSyncMessage(RegionSyncMessage.MsgType.AgentSit, OSDParser.SerializeJsonString(data)));
@ -996,7 +996,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public void HandleGrabObject(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) public void HandleGrabObject(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
{ {
m_log.DebugFormat("{0} HandleGrabObject for {1}", LogHeader(), remoteClient.AgentId.ToString()); // m_log.DebugFormat("{0} HandleGrabObject for {1}", LogHeader(), remoteClient.AgentId.ToString());
OSDMap data = new OSDMap(4); OSDMap data = new OSDMap(4);
data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["agentID"] = OSD.FromUUID(remoteClient.AgentId);
data["localID"] = OSD.FromUInteger(localID); data["localID"] = OSD.FromUInteger(localID);
@ -1007,7 +1007,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public void HandleGrabUpdate(UUID objectID, Vector3 offset, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) public void HandleGrabUpdate(UUID objectID, Vector3 offset, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
{ {
m_log.DebugFormat("{0} HandleGrabUpdate for {1}", LogHeader(), remoteClient.AgentId.ToString()); // m_log.DebugFormat("{0} HandleGrabUpdate for {1}", LogHeader(), remoteClient.AgentId.ToString());
OSDMap data = new OSDMap(5); OSDMap data = new OSDMap(5);
data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["agentID"] = OSD.FromUUID(remoteClient.AgentId);
data["objectID"] = OSD.FromUUID(objectID); data["objectID"] = OSD.FromUUID(objectID);
@ -1019,7 +1019,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public void HandleDeGrabObject(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) public void HandleDeGrabObject(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
{ {
m_log.DebugFormat("{0} HandleDeGrabObject for {1}", LogHeader(), remoteClient.AgentId.ToString()); // m_log.DebugFormat("{0} HandleDeGrabObject for {1}", LogHeader(), remoteClient.AgentId.ToString());
OSDMap data = new OSDMap(3); OSDMap data = new OSDMap(3);
data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["agentID"] = OSD.FromUUID(remoteClient.AgentId);
data["localID"] = OSD.FromUInteger(localID); data["localID"] = OSD.FromUInteger(localID);

7
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineConnector.cs
View File

@ -239,6 +239,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
Shutdown(); Shutdown();
} }
return; return;
/*
case RegionSyncMessage.MsgType.LoadBalanceRequest: case RegionSyncMessage.MsgType.LoadBalanceRequest:
{ {
m_syncServer.HandleLoadBalanceRequest(this); m_syncServer.HandleLoadBalanceRequest(this);
@ -260,6 +261,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
return; return;
} }
*/
case RegionSyncMessage.MsgType.PhysTerseUpdate: case RegionSyncMessage.MsgType.PhysTerseUpdate:
{ {
@ -487,7 +489,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
#endregion Send/Receive messages to/from the remote Physics Engine #endregion Send/Receive messages to/from the remote Physics Engine
#region Spacial query functions (should be eventually implemented within Scene) #region Spacial query functions (should be eventually implemented within Scene)
/*
//This should be a function of Scene, but since we don't have the quark concept in Scene yet, //This should be a function of Scene, but since we don't have the quark concept in Scene yet,
//for now we implement it here. //for now we implement it here.
//Ideally, for quark based space representation, the Scene has a list of quarks, and each quark points //Ideally, for quark based space representation, the Scene has a list of quarks, and each quark points
@ -512,15 +514,18 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
return sogList; return sogList;
} }
*/
#endregion #endregion
#region Load balancing functions #region Load balancing functions
/*
public void SendLoadBalanceRejection(string response) public void SendLoadBalanceRejection(string response)
{ {
RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.LoadBalanceRejection, response); RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.LoadBalanceRejection, response);
Send(msg); Send(msg);
} }
*/
#endregion #endregion
} }
} }

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs
View File

@ -545,6 +545,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
#endregion Event Handlers #endregion Event Handlers
#region Load balancing members and functions #region Load balancing members and functions
/*
//keep track of idle physics engines that are in the process of load balancing (they are off the idle list, but not a working physics engine yet (not sync'ing with Scene yet)). //keep track of idle physics engines that are in the process of load balancing (they are off the idle list, but not a working physics engine yet (not sync'ing with Scene yet)).
private Dictionary<string, IdlePhysEngineInfo> m_loadBalancingIdleSEs = new Dictionary<string,IdlePhysEngineInfo>(); private Dictionary<string, IdlePhysEngineInfo> m_loadBalancingIdleSEs = new Dictionary<string,IdlePhysEngineInfo>();
public void HandleLoadBalanceRequest(SceneToPhysEngineConnector seConnctor) public void HandleLoadBalanceRequest(SceneToPhysEngineConnector seConnctor)
@ -616,6 +617,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
seConnctor.SendLoadBalanceRejection("no idle physics engines"); seConnctor.SendLoadBalanceRejection("no idle physics engines");
} }
} }
*/
HashSet<string> exceptions = new HashSet<string>(); HashSet<string> exceptions = new HashSet<string>();
private OSDMap DeserializeMessage(RegionSyncMessage msg) private OSDMap DeserializeMessage(RegionSyncMessage msg)