* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection

* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)

1 files changed, 0 insertions, 137 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClientCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClientCollection.cs
deleted file mode 100644
index 4f375e4..0000000
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClientCollection.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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;
-using OpenSim.Framework;
-using OpenMetaverse;
-using BclExtras.Collections;
-
-using ReaderWriterLockImpl = OpenMetaverse.ReaderWriterLockSlim;
-
-namespace OpenSim.Region.ClientStack.LindenUDP
-{
-    /// <summary>
-    /// A thread safe mapping from endpoints to client references
-    /// </summary>
-    public sealed class UDPClientCollection
-    {
-        #region IComparers
-
-        private sealed class IPEndPointComparer : IComparer<IPEndPoint>
-        {
-            public int Compare(IPEndPoint x, IPEndPoint y)
-            {
-                int result = x.Address.Address.CompareTo(y.Address.Address);
-                if (result == 0) result = x.Port.CompareTo(y.Port);
-                return result;
-            }
-        }
-
-        #endregion IComparers
-
-        /// <summary>An immutable dictionary mapping from <seealso cref="IPEndPoint"/>
-        /// to <seealso cref="LLUDPClient"/> references</summary>
-        private ImmutableMap<IPEndPoint, LLUDPClient> m_dict;
-        /// <summary>Immutability grants thread safety for concurrent reads and
-        /// read-writes, but not concurrent writes</summary>
-        private object m_writeLock = new object();
-
-        /// <summary>Number of clients in the collection</summary>
-        public int Count { get { return m_dict.Count; } }
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public UDPClientCollection()
-        {
-            m_dict = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
-        }
-
-        /// <summary>
-        /// Add a client reference to the collection
-        /// </summary>
-        /// <param name="key">Remote endpoint of the client</param>
-        /// <param name="value">Reference to the client object</param>
-        public void Add(IPEndPoint key, LLUDPClient value)
-        {
-            lock (m_writeLock)
-                m_dict = m_dict.Add(key, value);
-        }
-
-        /// <summary>
-        /// Remove a client from the collection
-        /// </summary>
-        /// <param name="key">Remote endpoint of the client</param>
-        public void Remove(IPEndPoint key)
-        {
-            lock (m_writeLock)
-                m_dict = m_dict.Delete(key);
-        }
-
-        /// <summary>
-        /// Resets the client collection
-        /// </summary>
-        public void Clear()
-        {
-            lock (m_writeLock)
-                m_dict = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
-        }
-
-        /// <summary>
-        /// Checks if an endpoint is in the collection
-        /// </summary>
-        /// <param name="key">Endpoint to check for</param>
-        /// <returns>True if the endpoint was found in the collection, otherwise false</returns>
-        public bool ContainsKey(IPEndPoint key)
-        {
-            return m_dict.ContainsKey(key);
-        }
-
-        /// <summary>
-        /// Attempts to fetch a value out of the collection
-        /// </summary>
-        /// <param name="key">Endpoint of the client to retrieve</param>
-        /// <param name="value">Retrieved client, or null on lookup failure</param>
-        /// <returns>True if the lookup succeeded, otherwise false</returns>
-        public bool TryGetValue(IPEndPoint key, out LLUDPClient value)
-        {
-            return m_dict.TryGetValue(key, out value);
-        }
-
-        /// <summary>
-        /// Performs a given task in parallel for each of the elements in the
-        /// collection
-        /// </summary>
-        /// <param name="action">Action to perform on each element</param>
-        public void ForEach(Action<LLUDPClient> action)
-        {
-            Parallel.ForEach<LLUDPClient>(m_dict.Values, action);
-        }
-    }
-}