diff options
author | Justin Clark-Casey (justincc) | 2013-07-19 00:51:13 +0100 |
---|---|---|
committer | Diva Canto | 2013-07-21 08:58:55 -0700 |
commit | 61eda1f441092eb12936472de2dc73898e40aa16 (patch) | |
tree | 946091464ce67628e7ec3a3e3ca49349085ae19e /OpenSim/Region/OptionalModules/Agent/UDP | |
parent | Add measure of number of inbound AgentUpdates that were seen as significant t... (diff) | |
download | opensim-SC-61eda1f441092eb12936472de2dc73898e40aa16.zip opensim-SC-61eda1f441092eb12936472de2dc73898e40aa16.tar.gz opensim-SC-61eda1f441092eb12936472de2dc73898e40aa16.tar.bz2 opensim-SC-61eda1f441092eb12936472de2dc73898e40aa16.tar.xz |
Make the check as to whether any particular inbound AgentUpdate packet is significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.)
Appears to have some impact on cpu but needs testing.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/UDP')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index c208b38..3e6067d 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
611 | // | 611 | // |
612 | if (showParams.Length <= 4) | 612 | if (showParams.Length <= 4) |
613 | { | 613 | { |
614 | m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates"); | 614 | m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates"); |
615 | foreach (Scene scene in m_scenes.Values) | 615 | foreach (Scene scene in m_scenes.Values) |
616 | { | 616 | { |
617 | scene.ForEachClient( | 617 | scene.ForEachClient( |
@@ -624,7 +624,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
624 | int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum(); | 624 | int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum(); |
625 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); | 625 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); |
626 | 626 | ||
627 | m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11}/min {5,-16}", | 627 | m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", |
628 | scene.RegionInfo.RegionName, llClient.Name, | 628 | scene.RegionInfo.RegionName, llClient.Name, |
629 | llClient.SceneAgent.IsChildAgent ? "N" : "Y", | 629 | llClient.SceneAgent.IsChildAgent ? "N" : "Y", |
630 | (DateTime.Now - cinfo.StartedTime).Minutes, | 630 | (DateTime.Now - cinfo.StartedTime).Minutes, |