From ae8f8d60a69e636a58a7cce234e481f397e518e0 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Mon, 3 Jan 2011 12:21:38 -0800 Subject: [PATCH] remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages --- .../RegionSync/RegionSyncModule/RegionSyncClient.cs | 12 ++++++------ .../RegionSyncModule/SceneToPhysEngineConnector.cs | 7 ++++++- .../RegionSyncModule/SceneToPhysEngineSyncServer.cs | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs index 46546c5615..21224dc034 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs @@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule else { 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; 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) { - 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); data["agentID"] = OSD.FromUUID(agentID); data["targetID"] = OSD.FromUUID(targetID); @@ -988,7 +988,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule 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); data["agentID"] = OSD.FromUUID(agentID); 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 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); data["agentID"] = OSD.FromUUID(remoteClient.AgentId); 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 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); data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["objectID"] = OSD.FromUUID(objectID); @@ -1019,7 +1019,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public void HandleDeGrabObject(uint localID, IClientAPI remoteClient, List 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); data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["localID"] = OSD.FromUInteger(localID); diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineConnector.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineConnector.cs index 01e36f1006..4df6fa5afd 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineConnector.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineConnector.cs @@ -239,6 +239,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule Shutdown(); } return; + /* case RegionSyncMessage.MsgType.LoadBalanceRequest: { m_syncServer.HandleLoadBalanceRequest(this); @@ -260,6 +261,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule } return; } + */ case RegionSyncMessage.MsgType.PhysTerseUpdate: { @@ -487,7 +489,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule #endregion Send/Receive messages to/from the remote Physics Engine #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, //for now we implement it here. //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; } + */ #endregion #region Load balancing functions + /* public void SendLoadBalanceRejection(string response) { RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.LoadBalanceRejection, response); Send(msg); } + */ #endregion } } diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs index 7e18befae6..8b432030d0 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs @@ -545,6 +545,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule #endregion Event Handlers #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)). private Dictionary m_loadBalancingIdleSEs = new Dictionary(); public void HandleLoadBalanceRequest(SceneToPhysEngineConnector seConnctor) @@ -616,6 +617,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule seConnctor.SendLoadBalanceRejection("no idle physics engines"); } } + */ HashSet exceptions = new HashSet(); private OSDMap DeserializeMessage(RegionSyncMessage msg)