Moved ConcurrentBag to system.dll

svn path=/trunk/mcs/; revision=147541

mcs/class/corlib/System.Collections.Concurrent/ConcurrentBag.cs

@@ -1,223 +0,0 @@
-#if NET_4_0
-// 
-// ConcurrentBag.cs
-//  
-// Author:
-//       Jérémie "Garuma" Laval <[email protected]>
-// 
-// Copyright (c) 2009 Jérémie "Garuma" Laval
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace System.Collections.Concurrent
-{
-
-	public class ConcurrentBag<T> : IProducerConsumerCollection<T>, IEnumerable<T>, IEnumerable
-	{
-		int size = Environment.ProcessorCount + 1;
-		int multiplier = 2;
-		int count;
-		
-		CyclicDeque<T>[] container;
-		
-		object syncLock = new object ();
-		
-		public ConcurrentBag ()
-		{
-			container = new CyclicDeque<T>[size];
-			for (int i = 0; i < container.Length; i++)
-				container[i] = new CyclicDeque<T> ();
-		}
-		
-		public ConcurrentBag (IEnumerable<T> enumerable) : this ()
-		{
-			foreach (T item in enumerable)
-				Add (item);
-		}
-		
-		public bool TryAdd (T item)
-		{
-			Add (item);
-			
-			return true;
-		}
-		
-		public void Add (T item)
-		{
-			Interlocked.Increment (ref count);
-			GrowIfNecessary ();
-			
-			CyclicDeque<T> bag = GetBag ();
-			bag.PushBottom (item);
-		}
-		
-		public bool TryTake (out T item)
-		{
-			item = default (T);
-			CyclicDeque<T> bag = GetBag ();
-			
-			if (bag == null || bag.PopBottom (out item) != PopResult.Succeed) {
-				for (int i = 0; i < container.Length; i++) {
-					if (container[i].PopTop (out item) == PopResult.Succeed) {
-						Interlocked.Decrement (ref count);
-						return true;
-					}
-				}
-			} else {
-				Interlocked.Decrement (ref count);
-				return true;
-			}
-			
-			return false;
-		}
-		
-		public int Count {
-			get {
-				return count;
-			}
-		}
-		
-		public bool IsEmpty {
-			get {
-				return count == 0;
-			}
-		}
-		
-		public object SyncRoot  {
-			get {
-				return this;
-			}		
-		}
-		
-		public bool IsSynchronized  {
-			get {
-				return true;
-			}
-		}
-		
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return GetEnumeratorInternal ();
-		}
-		
-		IEnumerator<T> IEnumerable<T>.GetEnumerator ()
-		{
-			return GetEnumeratorInternal ();
-		}
-		
-		IEnumerator<T> GetEnumeratorInternal ()
-		{
-			for (int i = 0; i < size; i++) {
-				CyclicDeque<T> bag = container[i];
-				foreach (T item in bag.GetEnumerable ()) {
-					yield return item;
-				}
-			}
-		}
-		
-		public void CopyTo (Array array, int index)
-		{
-			T[] a = array as T[];
-			if (a == null)
-				return;
-			
-			CopyTo (a, index);
-		}
-		
-		public void CopyTo (T[] array, int index)
-		{
-			int c = count;
-			if (array.Length < c + index)
-				throw new InvalidOperationException ("Array is not big enough");
-			
-			CopyTo (array, index, c);
-		}
-		
-		void CopyTo (T[] array, int index, int num)
-		{
-			int i = index;
-			
-			foreach (T item in this) {
-				if (i >= num)
-					break;
-				
-				array[i++] = item;
-			}
-		}
-		
-		public T[] ToArray ()
-		{
-			int c = count;
-			T[] temp = new T[c];
-			
-			CopyTo (temp, 0, c);
-			
-			return temp;
-		}
-			
-		int GetIndex ()
-		{
-			return Thread.CurrentThread.ManagedThreadId - 1;
-		}
-		
-		void GrowIfNecessary ()
-		{
-			int index = GetIndex ();
-			int currentSize = size;
-			
-			while (index > currentSize - 1) {
-				currentSize = size;
-				Grow (currentSize);
-			}
-		}
-		
-		CyclicDeque<T> GetBag ()
-		{			
-			int i = GetIndex ();
-			
-			return i < container.Length ? container[i] : null;
-		}
-		
-		void Grow (int referenceSize)
-		{
-			lock (syncLock) {
-				if (referenceSize != size)
-					return;
-				
-				CyclicDeque<T>[] slice = new CyclicDeque<T>[size * multiplier];
-				int i = 0;
-				for (i = 0; i < container.Length; i++)
-					slice[i] = container[i];
-				for (; i < slice.Length; i++)
-					slice[i] = new CyclicDeque<T> ();
-				
-				container = slice;
-				size = slice.Length;
-			}
-		}
-	}
-}
-#endif

mcs/class/corlib/System.Threading.Tasks/Parallel.cs

@@ -107,6 +107,7 @@ namespace System.Threading.Tasks
 			return For<TLocal> (from, to, null, init, action, destruct);
 		}
 		
+		[MonoTODO]
 		public static ParallelLoopResult For<TLocal> (int from, int to, ParallelOptions options, 
 		                                              Func<TLocal> init, 
 		                                              Func<int, ParallelLoopState, TLocal, TLocal> action,
@@ -122,7 +123,9 @@ namespace System.Threading.Tasks
 			int step = Math.Min (5, (to - from) / num);
 			if (step <= 0)
 				step = 1;
-
+			
+			throw new NotImplementedException ();
+/*
 			// Each worker put the indexes it's responsible for here
 			// so that other worker may steal if they starve.
 			ConcurrentBag<int> bag = new ConcurrentBag<int> ();
@@ -200,12 +203,13 @@ namespace System.Threading.Tasks
 			}
 			
 			return new ParallelLoopResult (infos.LowestBreakIteration, !(infos.IsStopped.Value || infos.IsExceptional));
+*/			
 		}
 
 		#endregion
 		
 		#region Foreach
-		
+		[MonoTODO]
 		static ParallelLoopResult ForEach<TSource, TLocal> (Func<int, IList<IEnumerator<TSource>>> enumerable, ParallelOptions options,
 		                                                    Func<TLocal> init, Func<TSource, ParallelLoopState, TLocal, TLocal> action,
 		                                                    Action<TLocal> destruct)
@@ -216,6 +220,8 @@ namespace System.Threading.Tasks
 			Task[] tasks = new Task[num];
 			ParallelLoopState.ExternalInfos infos = new ParallelLoopState.ExternalInfos ();
 			
+			throw new NotImplementedException ();
+/*			
 			ConcurrentBag<TSource> bag = new ConcurrentBag<TSource> ();
 			const int bagCount = 5;
 			
@@ -287,6 +293,7 @@ namespace System.Threading.Tasks
 			}
 			
 			return new ParallelLoopResult (infos.LowestBreakIteration, !(infos.IsStopped.Value || infos.IsExceptional));
+			*/
 		}
 		
 		public static ParallelLoopResult ForEach<TSource> (IEnumerable<TSource> enumerable, Action<TSource> action)

mcs/class/corlib/corlib.dll.sources

@@ -1507,7 +1507,6 @@ System.Collections.Concurrent/OrderablePartitioner.cs
 System.Collections.Concurrent/ConcurrentDictionary.cs
 System.Collections.Concurrent/Partitioner.cs
 System.Collections.Concurrent/ConcurrentQueue.cs
-System.Collections.Concurrent/ConcurrentBag.cs
 System.Collections.Concurrent/ConcurrentSkipList.cs
 System.Collections.Concurrent/Partitionners/ListPartitioner.cs
 System.Collections.Concurrent/Partitionners/EnumerablePartitioner.cs