From d9b802bb26ee659a68270ac05ea0406389afc883 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 8 Jul 2008 11:25:18 +0000 Subject: * Split out various classes from IClientAPI into their own files, in accordance with code standards --- OpenSim/Framework/ClientInfo.cs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 OpenSim/Framework/ClientInfo.cs (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs new file mode 100644 index 0000000..099449d --- /dev/null +++ b/OpenSim/Framework/ClientInfo.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Net; + +namespace OpenSim.Framework +{ + [Serializable] + public class ClientInfo + { + public sAgentCircuitData agentcircuit; + + public Dictionary needAck; + + public List out_packets; + public Dictionary pendingAcks; + public EndPoint proxyEP; + + public uint sequence; + public byte[] usecircuit; + public EndPoint userEP; + } +} \ No newline at end of file -- cgit v1.1 From 3b9cf652349327f7b255a850d5b966a9e3b9437e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 11 Jul 2008 09:18:17 +0000 Subject: Update svn properties. --- OpenSim/Framework/ClientInfo.cs | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index 099449d..f41717f 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -1,22 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Net; - -namespace OpenSim.Framework -{ - [Serializable] - public class ClientInfo - { - public sAgentCircuitData agentcircuit; - - public Dictionary needAck; - - public List out_packets; - public Dictionary pendingAcks; - public EndPoint proxyEP; - - public uint sequence; - public byte[] usecircuit; - public EndPoint userEP; - } +using System; +using System.Collections.Generic; +using System.Net; + +namespace OpenSim.Framework +{ + [Serializable] + public class ClientInfo + { + public sAgentCircuitData agentcircuit; + + public Dictionary needAck; + + public List out_packets; + public Dictionary pendingAcks; + public EndPoint proxyEP; + + public uint sequence; + public byte[] usecircuit; + public EndPoint userEP; + } } \ No newline at end of file -- cgit v1.1 From bbb8d6fc51020a8734163313bfc0b8aac9e402c2 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 8 Nov 2008 14:28:43 +0000 Subject: Remove empty OSUUID.cs file. Add copyright headers. Minor formatting cleanup. --- OpenSim/Framework/ClientInfo.cs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index f41717f..7771f67 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -1,3 +1,30 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + using System; using System.Collections.Generic; using System.Net; -- cgit v1.1 From bdf95e54a2da5b60e7817d748f7389289a59bc5e Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Wed, 25 Feb 2009 00:32:26 +0000 Subject: A few updates necessary for load balancer. - handle GetUser request for nonexistent user gracefully - include throttle levels in ClientInfo - code to save/restore throttles in client stack - only update/send updates to active clients - make animation classes serializable --- OpenSim/Framework/ClientInfo.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index 7771f67..fbd18b5 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -45,5 +45,14 @@ namespace OpenSim.Framework public uint sequence; public byte[] usecircuit; public EndPoint userEP; + + public int resendThrottle; + public int landThrottle; + public int windThrottle; + public int cloudThrottle; + public int taskThrottle; + public int assetThrottle; + public int textureThrottle; + public int totalThrottle; } -} \ No newline at end of file +} -- cgit v1.1 From 549dc5aeb9e693f1f575896796d19b03ec3a732f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Apr 2011 08:58:04 -0700 Subject: Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time. --- OpenSim/Framework/ClientInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index fbd18b5..8292c6a 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -34,7 +34,7 @@ namespace OpenSim.Framework [Serializable] public class ClientInfo { - public sAgentCircuitData agentcircuit; + public AgentCircuitData agentcircuit; public Dictionary needAck; -- cgit v1.1 From 35f190cc920d3c6fd94c48928d29e15a9b143abf Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Apr 2011 09:06:57 -0700 Subject: One less [Serializable] -- ClientInfo. --- OpenSim/Framework/ClientInfo.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index 8292c6a..62acb70 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -31,7 +31,6 @@ using System.Net; namespace OpenSim.Framework { - [Serializable] public class ClientInfo { public AgentCircuitData agentcircuit; -- cgit v1.1 From 1b265b213b65076ee346d85f62d2d61a72ea3ca6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 10 Jul 2013 16:09:45 -0700 Subject: Added show client-stats [first last] command to expose what viewers are requesting. --- OpenSim/Framework/ClientInfo.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index 62acb70..9021315 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -33,12 +33,13 @@ namespace OpenSim.Framework { public class ClientInfo { - public AgentCircuitData agentcircuit; + public readonly DateTime StartedTime = DateTime.Now; + public AgentCircuitData agentcircuit = null; public Dictionary needAck; - public List out_packets; - public Dictionary pendingAcks; + public List out_packets = new List(); + public Dictionary pendingAcks = new Dictionary(); public EndPoint proxyEP; public uint sequence; @@ -53,5 +54,9 @@ namespace OpenSim.Framework public int assetThrottle; public int textureThrottle; public int totalThrottle; + + public Dictionary SyncRequests = new Dictionary(); + public Dictionary AsyncRequests = new Dictionary(); + public Dictionary GenericRequests = new Dictionary(); } } -- cgit v1.1 From af3498efdbd0b165a7e37095b1d8a9e54723993c Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Sun, 29 Jun 2014 18:49:27 +0300 Subject: In "show throttles", show the maximum drip rate. This shows whether a client is being throttled due to past poor performance. --- OpenSim/Framework/ClientInfo.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index 9021315..d68078e 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -54,6 +54,7 @@ namespace OpenSim.Framework public int assetThrottle; public int textureThrottle; public int totalThrottle; + public int maxThrottle; public Dictionary SyncRequests = new Dictionary(); public Dictionary AsyncRequests = new Dictionary(); -- cgit v1.1 From d33964222aa9e3b2e639469a32d0af4728b0f77d Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 10 Oct 2014 23:36:50 +0100 Subject: Fix an issue where specifying both max client and server outgoing UDP throttles would cause client throttles to be lower than expected when total requests exceeded the scene limit. This was because specifying a max client throttle would always request the max from the parent server throttle, no matter the actual total requests on the client throttle. This would lead to a lower server multiplier than expected. This change also adds a 'target' column to the "show throttles" output that shows the target rate (as set by client) if adaptive throttles is active. This commit also re-adds the functionality lost in recent 5c1a1458 to set a max client throttle when adaptive is active. This commit also adds TestClientThrottlePerClientAndRegionLimited and TestClientThrottleAdaptiveNoLimit regression tests --- OpenSim/Framework/ClientInfo.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenSim/Framework/ClientInfo.cs') diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs index d68078e..98e4465 100644 --- a/OpenSim/Framework/ClientInfo.cs +++ b/OpenSim/Framework/ClientInfo.cs @@ -54,6 +54,10 @@ namespace OpenSim.Framework public int assetThrottle; public int textureThrottle; public int totalThrottle; + + // Used by adaptive only + public int targetThrottle; + public int maxThrottle; public Dictionary SyncRequests = new Dictionary(); -- cgit v1.1