Merge pull request #360 from Reactive-Extensions/WeGotSemaphoreNow

Removing traces of a backport of Semaphore

Rx.NET/Source/src/System.Reactive/Concurrency/EventLoopScheduler.cs

@@ -6,10 +6,6 @@ using System.Collections.Generic;
 using System.Reactive.Disposables;
 using System.Threading;
 
-#if NO_SEMAPHORE
-using System.Reactive.Threading;
-#endif
-
 namespace System.Reactive.Concurrency
 {
     /// <summary>

Rx.NET/Source/src/System.Reactive/Linq/Observable/Delay.cs

@@ -8,10 +8,6 @@ using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 using System.Threading;
 
-#if NO_SEMAPHORE
-using System.Reactive.Threading;
-#endif
-
 namespace System.Reactive.Linq.ObservableImpl
 {
     class Delay<TSource> : Producer<TSource>

Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Blocking.cs

@@ -7,10 +7,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Reactive.Disposables;
 
-#if NO_SEMAPHORE
-using System.Reactive.Threading;
-#endif
-
 namespace System.Reactive.Linq
 {
 #if !NO_PERF

Rx.NET/Source/tests/Tests.System.Reactive/Semaphore.cs

@@ -1,118 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information. 
-
-#if SILVERLIGHT
-using System;
-
-namespace System.Threading
-{
-    //Monitor based implementation of Semaphore
-    //that mimicks the .NET Semaphore class (System.Threading.Semaphore)
-
-    internal sealed class Semaphore : IDisposable
-    {
-        private int m_currentCount;
-        private int m_maximumCount;
-        private object m_lockObject;
-        private bool m_disposed;
-
-        public Semaphore(int initialCount, int maximumCount)
-        {
-            if (initialCount < 0)
-            {
-                throw new ArgumentOutOfRangeException("initialCount", "Non-negative number required.");
-            }
-            if (maximumCount < 1)
-            {
-                throw new ArgumentOutOfRangeException("maximumCount", "Positive number required.");
-            }
-            if (initialCount > maximumCount)
-            {
-                throw new ArgumentException("Initial count must be smaller than maximum");
-            }
-
-            m_currentCount = initialCount;
-            m_maximumCount = maximumCount;
-            m_lockObject = new object();            
-        }
-
-        public int Release()
-        {
-            return this.Release(1);
-        }
-
-        public int Release(int releaseCount)
-        {            
-            if (releaseCount < 1)
-            {
-                throw new ArgumentOutOfRangeException("releaseCount", "Positive number required.");
-            }
-            if (m_disposed)
-            {
-                throw new ObjectDisposedException("Semaphore");
-            }
-
-            var oldCount = default(int);
-            lock (m_lockObject)
-            {
-                oldCount = m_currentCount;
-                if (releaseCount + m_currentCount > m_maximumCount)
-                {
-                    throw new ArgumentOutOfRangeException("releaseCount", "Amount of releases would overflow maximum");
-                }
-                m_currentCount += releaseCount;
-                //PulseAll makes sure all waiting threads get queued for acquiring the lock
-                //Pulse would only queue one thread.
-
-                Monitor.PulseAll(m_lockObject);
-            }
-            return oldCount;
-        }
-
-        public bool WaitOne()
-        {
-            return WaitOne(Timeout.Infinite);
-        }
-
-        public bool WaitOne(int millisecondsTimeout)
-        {
-            if (m_disposed)
-            {
-                throw new ObjectDisposedException("Semaphore");
-            }
-
-            lock (m_lockObject)
-            {
-                while (m_currentCount == 0)
-                {
-                    if (!Monitor.Wait(m_lockObject, millisecondsTimeout))
-                    {
-                        return false;
-                    }
-                }
-                m_currentCount--;
-                return true;
-            }
-        }
-
-        public bool WaitOne(TimeSpan timeout)
-        {
-            return WaitOne((int)timeout.TotalMilliseconds);
-        }
-
-        public void Close()
-        {
-            Dispose();
-        }
-
-        public void Dispose()
-        {
-            //the .NET CLR semaphore does not release waits upon dispose
-            //so we don't do that either.
-            m_disposed = true;
-            m_lockObject = null;
-        }
-    }
-}
-#endif