diff options
author | Diva Canto | 2013-07-10 16:09:45 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-10 16:09:45 -0700 |
commit | 1b265b213b65076ee346d85f62d2d61a72ea3ca6 (patch) | |
tree | de0bcebaaeba7057fc1ca752229e9394dace66da /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |
parent | Comment out old inbound UDP throttling hack. This would cause the UDP (diff) | |
download | opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.zip opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.gz opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.bz2 opensim-SC_OLD-1b265b213b65076ee346d85f62d2d61a72ea3ca6.tar.xz |
Added show client-stats [first last] command to expose what viewers are requesting.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 109 |
1 files changed, 107 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 992f38e..b1aec81 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Linq; | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using System.Text; | 32 | using System.Text; |
32 | using log4net; | 33 | using log4net; |
@@ -51,7 +52,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
51 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")] | 52 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")] |
52 | public class LindenUDPInfoModule : ISharedRegionModule | 53 | public class LindenUDPInfoModule : ISharedRegionModule |
53 | { | 54 | { |
54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 56 | ||
56 | protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 57 | protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
57 | 58 | ||
@@ -130,6 +131,15 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
130 | "Go on/off emergency monitoring mode", | 131 | "Go on/off emergency monitoring mode", |
131 | "Go on/off emergency monitoring mode", | 132 | "Go on/off emergency monitoring mode", |
132 | HandleEmergencyMonitoring); | 133 | HandleEmergencyMonitoring); |
134 | |||
135 | scene.AddCommand( | ||
136 | "Comms", this, "show client-stats", | ||
137 | "show client-stats [first_name last_name]", | ||
138 | "Show client request stats", | ||
139 | "Without the 'first_name last_name' option, all clients are shown." | ||
140 | + " With the 'first_name last_name' option only a specific client is shown.", | ||
141 | (mod, cmd) => MainConsole.Instance.Output(HandleClientStatsReport(cmd))); | ||
142 | |||
133 | } | 143 | } |
134 | 144 | ||
135 | public void RemoveRegion(Scene scene) | 145 | public void RemoveRegion(Scene scene) |
@@ -587,6 +597,101 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
587 | (throttleRates.Asset * 8) / 1000); | 597 | (throttleRates.Asset * 8) / 1000); |
588 | 598 | ||
589 | return report.ToString(); | 599 | return report.ToString(); |
590 | } | 600 | } |
601 | |||
602 | /// <summary> | ||
603 | /// Show client stats data | ||
604 | /// </summary> | ||
605 | /// <param name="showParams"></param> | ||
606 | /// <returns></returns> | ||
607 | protected string HandleClientStatsReport(string[] showParams) | ||
608 | { | ||
609 | // NOTE: This writes to m_log on purpose. We want to store this information | ||
610 | // in case we need to analyze it later. | ||
611 | // | ||
612 | if (showParams.Length <= 3) | ||
613 | { | ||
614 | m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,6} {3,11} {4, 10}", "Region", "Name", "Root", "Time", "Reqs/min"); | ||
615 | foreach (Scene scene in m_scenes.Values) | ||
616 | { | ||
617 | scene.ForEachClient( | ||
618 | delegate(IClientAPI client) | ||
619 | { | ||
620 | if (client is LLClientView) | ||
621 | { | ||
622 | LLClientView llClient = client as LLClientView; | ||
623 | ClientInfo cinfo = llClient.UDPClient.GetClientInfo(); | ||
624 | int avg_reqs = cinfo.AsyncRequests.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count; | ||
625 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); | ||
626 | |||
627 | m_log.InfoFormat("[INFO]: {0,-12} {1,20} {2,4} {3,9}min {4,10}", | ||
628 | scene.RegionInfo.RegionName, llClient.Name, | ||
629 | (llClient.SceneAgent.IsChildAgent ? "N" : "Y"), (DateTime.Now - cinfo.StartedTime).Minutes, avg_reqs); | ||
630 | } | ||
631 | }); | ||
632 | } | ||
633 | return string.Empty; | ||
634 | } | ||
635 | |||
636 | string fname = "", lname = ""; | ||
637 | |||
638 | if (showParams.Length > 2) | ||
639 | fname = showParams[2]; | ||
640 | if (showParams.Length > 3) | ||
641 | lname = showParams[3]; | ||
642 | |||
643 | foreach (Scene scene in m_scenes.Values) | ||
644 | { | ||
645 | scene.ForEachClient( | ||
646 | delegate(IClientAPI client) | ||
647 | { | ||
648 | if (client is LLClientView) | ||
649 | { | ||
650 | LLClientView llClient = client as LLClientView; | ||
651 | |||
652 | if (llClient.Name == fname + " " + lname) | ||
653 | { | ||
654 | |||
655 | ClientInfo cinfo = llClient.GetClientInfo(); | ||
656 | AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(llClient.CircuitCode); | ||
657 | if (aCircuit == null) // create a dummy one | ||
658 | aCircuit = new AgentCircuitData(); | ||
659 | |||
660 | if (!llClient.SceneAgent.IsChildAgent) | ||
661 | m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, aCircuit.Viewer, aCircuit.Id0); | ||
662 | |||
663 | int avg_reqs = cinfo.AsyncRequests.Count + cinfo.GenericRequests.Count + cinfo.SyncRequests.Count; | ||
664 | avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1); | ||
665 | |||
666 | m_log.InfoFormat("[INFO]:"); | ||
667 | m_log.InfoFormat("[INFO]: {0} # {1} # Time: {2}min # Avg Reqs/min: {3}", scene.RegionInfo.RegionName, | ||
668 | (llClient.SceneAgent.IsChildAgent ? "Child" : "Root"), (DateTime.Now - cinfo.StartedTime).Minutes, avg_reqs); | ||
669 | |||
670 | Dictionary<string, int> sortedDict = (from entry in cinfo.AsyncRequests orderby entry.Value descending select entry) | ||
671 | .ToDictionary(pair => pair.Key, pair => pair.Value); | ||
672 | |||
673 | m_log.InfoFormat("[INFO]: {0,25}", "TOP ASYNC"); | ||
674 | foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12)) | ||
675 | m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value); | ||
676 | |||
677 | m_log.InfoFormat("[INFO]:"); | ||
678 | sortedDict = (from entry in cinfo.SyncRequests orderby entry.Value descending select entry) | ||
679 | .ToDictionary(pair => pair.Key, pair => pair.Value); | ||
680 | m_log.InfoFormat("[INFO]: {0,25}", "TOP SYNC"); | ||
681 | foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12)) | ||
682 | m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value); | ||
683 | |||
684 | m_log.InfoFormat("[INFO]:"); | ||
685 | sortedDict = (from entry in cinfo.GenericRequests orderby entry.Value descending select entry) | ||
686 | .ToDictionary(pair => pair.Key, pair => pair.Value); | ||
687 | m_log.InfoFormat("[INFO]: {0,25}", "TOP GENERIC"); | ||
688 | foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12)) | ||
689 | m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value); | ||
690 | } | ||
691 | } | ||
692 | }); | ||
693 | } | ||
694 | return string.Empty; | ||
695 | } | ||
591 | } | 696 | } |
592 | } \ No newline at end of file | 697 | } \ No newline at end of file |