* Commit 2/3 - Please dont attempt to update to this revision until all 3 are in.

author: Adam Frisby 2008-05-02 16:41:08 +0000
committer: Adam Frisby 2008-05-02 16:41:08 +0000
commit: 29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71 (patch)
tree: 848ce119d9b87bc186c20b08cc604de50a872b31 /OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
parent: * Refactored ClientView into LLClientView. Removed all direct references to U... (diff)
download: opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.zip
opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.gz
opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.bz2
opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.xz
1 files changed, 93 insertions, 93 deletions
diff --git a/OpenSim/Region/ClientStack/PacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
index 3d3b659..792429a 100644
--- a/OpenSim/Region/ClientStack/PacketThrottle.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
@@ -1,93 +1,93 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * 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
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-namespace OpenSim.Region.ClientStack
+namespace OpenSim.Region.ClientStack.LindenUDP
-{
+{
-    public class PacketThrottle
+    public class LLPacketThrottle
-    {
+    {
-        private int max; // max allowable throttle
+        private int max; // max allowable throttle
-        private int min; // min allowable throttle
+        private int min; // min allowable throttle
-        private int throttle; // current throttle setting
+        private int throttle; // current throttle setting
-        private static int divisor = 7; // the throttle time divisor, this probably should factor out
+        private static int divisor = 7; // the throttle time divisor, this probably should factor out
-        private int sent; // current number of bytes sent
+        private int sent; // current number of bytes sent
-        public PacketThrottle(int Min, int Max, int Throttle)
+        public LLPacketThrottle(int Min, int Max, int Throttle)
-        {
+        {
-            max = Max;
+            max = Max;
-            min = Min;
+            min = Min;
-            throttle = Throttle;
+            throttle = Throttle;
-            sent = 0;
+            sent = 0;
-        }
+        }
-        public void Reset()
+        public void Reset()
-        {
+        {
-            sent = 0;
+            sent = 0;
-        }
+        }
-        public bool UnderLimit()
+        public bool UnderLimit()
-        {
+        {
-            return (sent < (throttle/divisor));
+            return (sent < (throttle/divisor));
-        }
+        }
-        public int Add(int bytes)
+        public int Add(int bytes)
-        {
+        {
-            sent += bytes;
+            sent += bytes;
-            return sent;
+            return sent;
-        }
+        }
-        // Properties
+        // Properties
-        public int Max
+        public int Max
-        {
+        {
-            get { return max; }
+            get { return max; }
-        }
+        }
-        public int Min
+        public int Min
-        {
+        {
-            get { return min; }
+            get { return min; }
-        }
+        }
-        public int Throttle
+        public int Throttle
-        {
+        {
-            get { return throttle; }
+            get { return throttle; }
-            set
+            set
-            {
+            {
-                if (value > max)
+                if (value > max)
-                {
+                {
-                    throttle = max;
+                    throttle = max;
-                }
+                }
-                else if (value < min)
+                else if (value < min)
-                {
+                {
-                    throttle = min;
+                    throttle = min;
-                }
+                }
-                else
+                else
-                {
+                {
-                    throttle = value;
+                    throttle = value;
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}
+\ No newline at end of file
author	Adam Frisby	2008-05-02 16:41:08 +0000
committer	Adam Frisby	2008-05-02 16:41:08 +0000
commit	29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71 (patch)
tree	848ce119d9b87bc186c20b08cc604de50a872b31 /OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
parent	* Refactored ClientView into LLClientView. Removed all direct references to U... (diff)
download	opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.zip opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.gz opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.bz2 opensim-SC-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.xz

diff --git a/OpenSim/Region/ClientStack/PacketThrottle.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs index 3d3b659..792429a 100644 --- a/OpenSim/Region/ClientStack/PacketThrottle.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketThrottle.cs
@@ -1,93 +1,93 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	namespace OpenSim.Region.ClientStack	28	namespace OpenSim.Region.ClientStack.LindenUDP
29	{	29	{
30	public class PacketThrottle	30	public class LLPacketThrottle
31	{	31	{
32	private int max; // max allowable throttle	32	private int max; // max allowable throttle
33	private int min; // min allowable throttle	33	private int min; // min allowable throttle
34	private int throttle; // current throttle setting	34	private int throttle; // current throttle setting
35	private static int divisor = 7; // the throttle time divisor, this probably should factor out	35	private static int divisor = 7; // the throttle time divisor, this probably should factor out
36	private int sent; // current number of bytes sent	36	private int sent; // current number of bytes sent
37		37
38	public PacketThrottle(int Min, int Max, int Throttle)	38	public LLPacketThrottle(int Min, int Max, int Throttle)
39	{	39	{
40	max = Max;	40	max = Max;
41	min = Min;	41	min = Min;
42	throttle = Throttle;	42	throttle = Throttle;
43	sent = 0;	43	sent = 0;
44	}	44	}
45		45
46	public void Reset()	46	public void Reset()
47	{	47	{
48	sent = 0;	48	sent = 0;
49	}	49	}
50		50
51	public bool UnderLimit()	51	public bool UnderLimit()
52	{	52	{
53	return (sent < (throttle/divisor));	53	return (sent < (throttle/divisor));
54	}	54	}
55		55
56	public int Add(int bytes)	56	public int Add(int bytes)
57	{	57	{
58	sent += bytes;	58	sent += bytes;
59	return sent;	59	return sent;
60	}	60	}
61		61
62	// Properties	62	// Properties
63	public int Max	63	public int Max
64	{	64	{
65	get { return max; }	65	get { return max; }
66	}	66	}
67		67
68	public int Min	68	public int Min
69	{	69	{
70	get { return min; }	70	get { return min; }
71	}	71	}
72		72
73	public int Throttle	73	public int Throttle
74	{	74	{
75	get { return throttle; }	75	get { return throttle; }
76	set	76	set
77	{	77	{
78	if (value > max)	78	if (value > max)
79	{	79	{
80	throttle = max;	80	throttle = max;
81	}	81	}
82	else if (value < min)	82	else if (value < min)
83	{	83	{
84	throttle = min;	84	throttle = min;
85	}	85	}
86	else	86	else
87	{	87	{
88	throttle = value;	88	throttle = value;
89	}	89	}
90	}	90	}
91	}	91	}
92	}	92	}
93	}	93	} \ No newline at end of file