Merge branch 'master' of https://github.com/grpc/grpc
Siddharth Rakesh
10 years ago
commit
668f33c6f3
24 changed files with 649 additions and 270 deletions
@ -0,0 +1,105 @@ |
||||
#region Copyright notice and license |
||||
|
||||
// Copyright 2015, Google Inc. |
||||
// All rights reserved. |
||||
// |
||||
// 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 Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "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 COPYRIGHT |
||||
// OWNER OR 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. |
||||
|
||||
#endregion |
||||
|
||||
using System; |
||||
using System.Collections.Generic; |
||||
using Grpc.Core; |
||||
using Grpc.Core.Internal; |
||||
using Grpc.Core.Utils; |
||||
using NUnit.Framework; |
||||
|
||||
namespace Grpc.Core.Internal.Tests |
||||
{ |
||||
public class ChannelOptionsTest |
||||
{ |
||||
[Test] |
||||
public void IntOption() |
||||
{ |
||||
var option = new ChannelOption("somename", 1); |
||||
|
||||
Assert.AreEqual(ChannelOption.OptionType.Integer, option.Type); |
||||
Assert.AreEqual("somename", option.Name); |
||||
Assert.AreEqual(1, option.IntValue); |
||||
Assert.Throws(typeof(InvalidOperationException), () => { var s = option.StringValue; }); |
||||
} |
||||
|
||||
[Test] |
||||
public void StringOption() |
||||
{ |
||||
var option = new ChannelOption("somename", "ABCDEF"); |
||||
|
||||
Assert.AreEqual(ChannelOption.OptionType.String, option.Type); |
||||
Assert.AreEqual("somename", option.Name); |
||||
Assert.AreEqual("ABCDEF", option.StringValue); |
||||
Assert.Throws(typeof(InvalidOperationException), () => { var s = option.IntValue; }); |
||||
} |
||||
|
||||
[Test] |
||||
public void ConstructorPreconditions() |
||||
{ |
||||
Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption(null, "abc"); }); |
||||
Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption(null, 1); }); |
||||
Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption("abc", null); }); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateChannelArgsNull() |
||||
{ |
||||
var channelArgs = ChannelOptions.CreateChannelArgs(null); |
||||
Assert.IsTrue(channelArgs.IsInvalid); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateChannelArgsEmpty() |
||||
{ |
||||
var options = new List<ChannelOption>(); |
||||
var channelArgs = ChannelOptions.CreateChannelArgs(options); |
||||
channelArgs.Dispose(); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateChannelArgs() |
||||
{ |
||||
var options = new List<ChannelOption> |
||||
{ |
||||
new ChannelOption("ABC", "XYZ"), |
||||
new ChannelOption("somename", "IJKLM"), |
||||
new ChannelOption("intoption", 12345), |
||||
new ChannelOption("GHIJK", 12345), |
||||
}; |
||||
|
||||
var channelArgs = ChannelOptions.CreateChannelArgs(options); |
||||
channelArgs.Dispose(); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,75 @@ |
||||
#region Copyright notice and license |
||||
|
||||
// Copyright 2015, Google Inc. |
||||
// All rights reserved. |
||||
// |
||||
// 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 Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "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 COPYRIGHT |
||||
// OWNER OR 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. |
||||
|
||||
#endregion |
||||
|
||||
using System; |
||||
using Grpc.Core; |
||||
using Grpc.Core.Internal; |
||||
using Grpc.Core.Utils; |
||||
using NUnit.Framework; |
||||
|
||||
namespace Grpc.Core.Internal.Tests |
||||
{ |
||||
public class ChannelArgsSafeHandleTest |
||||
{ |
||||
[Test] |
||||
public void CreateEmptyAndDestroy() |
||||
{ |
||||
var channelArgs = ChannelArgsSafeHandle.Create(0); |
||||
channelArgs.Dispose(); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateNonEmptyAndDestroy() |
||||
{ |
||||
var channelArgs = ChannelArgsSafeHandle.Create(5); |
||||
channelArgs.Dispose(); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateNullAndDestroy() |
||||
{ |
||||
var channelArgs = ChannelArgsSafeHandle.CreateNull(); |
||||
channelArgs.Dispose(); |
||||
} |
||||
|
||||
[Test] |
||||
public void CreateFillAndDestroy() |
||||
{ |
||||
var channelArgs = ChannelArgsSafeHandle.Create(3); |
||||
channelArgs.SetInteger(0, "somekey", 12345); |
||||
channelArgs.SetString(1, "somekey", "abcdefghijkl"); |
||||
channelArgs.SetString(2, "somekey", "XYZ"); |
||||
channelArgs.Dispose(); |
||||
} |
||||
} |
||||
} |
||||
@ -1,115 +0,0 @@ |
||||
#region Copyright notice and license |
||||
// Copyright 2015, Google Inc. |
||||
// All rights reserved. |
||||
// |
||||
// 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 Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "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 COPYRIGHT |
||||
// OWNER OR 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. |
||||
#endregion |
||||
using System; |
||||
using System.Collections.Generic; |
||||
using System.Collections.Immutable; |
||||
using System.Runtime.InteropServices; |
||||
using System.Threading; |
||||
using System.Threading.Tasks; |
||||
using Grpc.Core.Internal; |
||||
|
||||
namespace Grpc.Core |
||||
{ |
||||
/// <summary> |
||||
/// gRPC channel options. |
||||
/// </summary> |
||||
public class ChannelArgs |
||||
{ |
||||
public const string SslTargetNameOverrideKey = "grpc.ssl_target_name_override"; |
||||
|
||||
readonly ImmutableDictionary<string, string> stringArgs; |
||||
|
||||
private ChannelArgs(ImmutableDictionary<string, string> stringArgs) |
||||
{ |
||||
this.stringArgs = stringArgs; |
||||
} |
||||
|
||||
public string GetSslTargetNameOverride() |
||||
{ |
||||
string result; |
||||
if (stringArgs.TryGetValue(SslTargetNameOverrideKey, out result)) |
||||
{ |
||||
return result; |
||||
} |
||||
return null; |
||||
} |
||||
|
||||
public static Builder CreateBuilder() |
||||
{ |
||||
return new Builder(); |
||||
} |
||||
|
||||
public class Builder |
||||
{ |
||||
readonly Dictionary<string, string> stringArgs = new Dictionary<string, string>(); |
||||
|
||||
// TODO: AddInteger not supported yet. |
||||
public Builder AddString(string key, string value) |
||||
{ |
||||
stringArgs.Add(key, value); |
||||
return this; |
||||
} |
||||
|
||||
public ChannelArgs Build() |
||||
{ |
||||
return new ChannelArgs(stringArgs.ToImmutableDictionary()); |
||||
} |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Creates native object for the channel arguments. |
||||
/// </summary> |
||||
/// <returns>The native channel arguments.</returns> |
||||
internal ChannelArgsSafeHandle ToNativeChannelArgs() |
||||
{ |
||||
ChannelArgsSafeHandle nativeArgs = null; |
||||
try |
||||
{ |
||||
nativeArgs = ChannelArgsSafeHandle.Create(stringArgs.Count); |
||||
int i = 0; |
||||
foreach (var entry in stringArgs) |
||||
{ |
||||
nativeArgs.SetString(i, entry.Key, entry.Value); |
||||
i++; |
||||
} |
||||
return nativeArgs; |
||||
} |
||||
catch (Exception) |
||||
{ |
||||
if (nativeArgs != null) |
||||
{ |
||||
nativeArgs.Dispose(); |
||||
} |
||||
throw; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,178 @@ |
||||
#region Copyright notice and license |
||||
// Copyright 2015, Google Inc. |
||||
// All rights reserved. |
||||
// |
||||
// 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 Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "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 COPYRIGHT |
||||
// OWNER OR 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. |
||||
#endregion |
||||
using System; |
||||
using System.Collections.Generic; |
||||
using System.Collections.Immutable; |
||||
using System.Runtime.InteropServices; |
||||
using System.Threading; |
||||
using System.Threading.Tasks; |
||||
using Grpc.Core.Internal; |
||||
using Grpc.Core.Utils; |
||||
|
||||
namespace Grpc.Core |
||||
{ |
||||
/// <summary> |
||||
/// Channel option specified when creating a channel. |
||||
/// Corresponds to grpc_channel_args from grpc/grpc.h. |
||||
/// </summary> |
||||
public sealed class ChannelOption |
||||
{ |
||||
public enum OptionType |
||||
{ |
||||
Integer, |
||||
String |
||||
} |
||||
|
||||
private readonly OptionType type; |
||||
private readonly string name; |
||||
private readonly int intValue; |
||||
private readonly string stringValue; |
||||
|
||||
/// <summary> |
||||
/// Creates a channel option with a string value. |
||||
/// </summary> |
||||
/// <param name="name">Name.</param> |
||||
/// <param name="stringValue">String value.</param> |
||||
public ChannelOption(string name, string stringValue) |
||||
{ |
||||
this.type = OptionType.String; |
||||
this.name = Preconditions.CheckNotNull(name); |
||||
this.stringValue = Preconditions.CheckNotNull(stringValue); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Creates a channel option with an integer value. |
||||
/// </summary> |
||||
/// <param name="name">Name.</param> |
||||
/// <param name="stringValue">String value.</param> |
||||
public ChannelOption(string name, int intValue) |
||||
{ |
||||
this.type = OptionType.Integer; |
||||
this.name = Preconditions.CheckNotNull(name); |
||||
this.intValue = intValue; |
||||
} |
||||
|
||||
public OptionType Type |
||||
{ |
||||
get |
||||
{ |
||||
return type; |
||||
} |
||||
} |
||||
|
||||
public string Name |
||||
{ |
||||
get |
||||
{ |
||||
return name; |
||||
} |
||||
} |
||||
|
||||
public int IntValue |
||||
{ |
||||
get |
||||
{ |
||||
Preconditions.CheckState(type == OptionType.Integer); |
||||
return intValue; |
||||
} |
||||
} |
||||
|
||||
public string StringValue |
||||
{ |
||||
get |
||||
{ |
||||
Preconditions.CheckState(type == OptionType.String); |
||||
return stringValue; |
||||
} |
||||
} |
||||
} |
||||
|
||||
public static class ChannelOptions |
||||
{ |
||||
// Override SSL target check. Only to be used for testing. |
||||
public const string SslTargetNameOverride = "grpc.ssl_target_name_override"; |
||||
|
||||
// Enable census for tracing and stats collection |
||||
public const string Census = "grpc.census"; |
||||
|
||||
// Maximum number of concurrent incoming streams to allow on a http2 connection |
||||
public const string MaxConcurrentStreams = "grpc.max_concurrent_streams"; |
||||
|
||||
// Maximum message length that the channel can receive |
||||
public const string MaxMessageLength = "grpc.max_message_length"; |
||||
|
||||
// Initial sequence number for http2 transports |
||||
public const string Http2InitialSequenceNumber = "grpc.http2.initial_sequence_number"; |
||||
|
||||
/// <summary> |
||||
/// Creates native object for a collection of channel options. |
||||
/// </summary> |
||||
/// <returns>The native channel arguments.</returns> |
||||
internal static ChannelArgsSafeHandle CreateChannelArgs(IEnumerable<ChannelOption> options) |
||||
{ |
||||
if (options == null) |
||||
{ |
||||
return ChannelArgsSafeHandle.CreateNull(); |
||||
} |
||||
var optionList = new List<ChannelOption>(options); // It's better to do defensive copy |
||||
ChannelArgsSafeHandle nativeArgs = null; |
||||
try |
||||
{ |
||||
nativeArgs = ChannelArgsSafeHandle.Create(optionList.Count); |
||||
for (int i = 0; i < optionList.Count; i++) |
||||
{ |
||||
var option = optionList[i]; |
||||
if (option.Type == ChannelOption.OptionType.Integer) |
||||
{ |
||||
nativeArgs.SetInteger(i, option.Name, option.IntValue); |
||||
} |
||||
else if (option.Type == ChannelOption.OptionType.String) |
||||
{ |
||||
nativeArgs.SetString(i, option.Name, option.StringValue); |
||||
} |
||||
else |
||||
{ |
||||
throw new InvalidOperationException("Unknown option type"); |
||||
} |
||||
} |
||||
return nativeArgs; |
||||
} |
||||
catch (Exception) |
||||
{ |
||||
if (nativeArgs != null) |
||||
{ |
||||
nativeArgs.Dispose(); |
||||
} |
||||
throw; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue