Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -36,14 +36,12 @@ namespace System.Net
{
delegate void SimpleAsyncCallback (SimpleAsyncResult result);
delegate bool SimpleAsyncFunc (SimpleAsyncResult result);
class SimpleAsyncResult : IAsyncResult
{
ManualResetEvent handle;
bool synch;
bool isCompleted;
SimpleAsyncCallback cb;
readonly SimpleAsyncCallback cb;
object state;
bool callbackDone;
Exception exc;
@@ -63,7 +61,7 @@ namespace System.Net
};
}
public static void Run (SimpleAsyncFunc func, SimpleAsyncCallback callback)
public static void Run (Func<SimpleAsyncResult, bool> func, SimpleAsyncCallback callback)
{
var result = new SimpleAsyncResult (callback);
try {
@@ -74,7 +72,7 @@ namespace System.Net
}
}
public static void RunWithLock (object locker, SimpleAsyncFunc func, SimpleAsyncCallback callback)
public static void RunWithLock (object locker, Func<SimpleAsyncResult, bool> func, SimpleAsyncCallback callback)
{
Run (inner => {
bool running = func (inner);
@@ -123,7 +121,7 @@ namespace System.Net
DoCallback_private ();
}
protected void SetCompleted_internal (bool synch, Exception e)
void SetCompleted_internal (bool synch, Exception e)
{
this.synch = synch;
exc = e;
@@ -136,13 +134,7 @@ namespace System.Net
protected void SetCompleted_internal (bool synch)
{
this.synch = synch;
exc = null;
lock (locker) {
isCompleted = true;
if (handle != null)
handle.Set ();
}
SetCompleted_internal (synch, null);
}
void DoCallback_private ()