Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -132,11 +132,11 @@ namespace System.ServiceModel.Channels
protected override void OnClose (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
// this implicitly premises: TChannel is IChannel
foreach (IChannel ch in channels)
ch.Close (timeout - (DateTime.Now - start));
base.OnClose (timeout - (DateTime.Now - start));
ch.Close (timeout - (DateTime.UtcNow - start));
base.OnClose (timeout - (DateTime.UtcNow - start));
}
protected override IAsyncResult OnBeginClose (TimeSpan timeout, AsyncCallback callback, object state)

View File

@@ -69,7 +69,6 @@ namespace System.ServiceModel.Channels
{
Console.WriteLine ("NamedPipeChannelListener.OnAcceptChannel");
DateTime start = DateTime.Now;
if (active_server != null) {
try {
server_release_handle.WaitOne (timeout);

View File

@@ -95,7 +95,6 @@ namespace System.ServiceModel.Channels
if (message.Headers.RelatesTo == null)
message.Headers.RelatesTo = request.Headers.MessageId;
DateTime start = DateTime.Now;
owner.frame.WriteUnsizedMessage (message, timeout);
owner.frame.WriteEndRecord ();
owner.server.Close ();
@@ -106,7 +105,6 @@ namespace System.ServiceModel.Channels
public override bool TryReceiveRequest (TimeSpan timeout, out RequestContext context)
{
try {
DateTime start = DateTime.Now;
context = ReceiveRequest (timeout);
return context != null;
} catch (TimeoutException) {
@@ -126,8 +124,6 @@ namespace System.ServiceModel.Channels
protected override void OnOpen (TimeSpan timeout)
{
DateTime start = DateTime.Now;
// FIXME: use timeout
frame = new TcpBinaryFrameManager (TcpBinaryFrameManager.SingletonUnsizedMode, server, true) { Encoder = this.Encoder };
frame.ProcessPreambleRecipient ();

View File

@@ -78,7 +78,7 @@ namespace System.ServiceModel.Channels
public override Message Request (Message input, TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
CreateClient (timeout);
@@ -87,11 +87,11 @@ namespace System.ServiceModel.Channels
if (input.Headers.MessageId == null)
input.Headers.MessageId = new UniqueId ();
frame.WriteUnsizedMessage (input, timeout - (DateTime.Now - start));
frame.WriteUnsizedMessage (input, timeout - (DateTime.UtcNow - start));
frame.WriteEndRecord ();
var ret = frame.ReadUnsizedMessage (timeout - (DateTime.Now - start));
var ret = frame.ReadUnsizedMessage (timeout - (DateTime.UtcNow - start));
frame.ReadEndRecord ();
return ret;
}

View File

@@ -70,11 +70,11 @@ namespace System.ServiceModel.Channels
protected override TChannel OnAcceptChannel (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
if (channel != null)
if (!accept_handle.WaitOne (timeout))
throw new TimeoutException ();
channel = PopulateChannel (timeout - (DateTime.Now - start));
channel = PopulateChannel (timeout - (DateTime.UtcNow - start));
((CommunicationObject) (object) channel).Closed += delegate {
this.channel = null;
accept_handle.Set ();