address a TODO

pull/19792/head
Jan Tattermusch 6 years ago
parent dd55158707
commit 9ae5c5df24
  1. 3
      src/csharp/Grpc.Core.Tests/Internal/SliceBufferSafeHandleTest.cs
  2. 2
      src/csharp/Grpc.Core/Internal/AsyncCallServer.cs
  3. 7
      src/csharp/Grpc.Core/Internal/CallSafeHandle.cs
  4. 2
      src/csharp/Grpc.Microbenchmarks/Utf8Encode.cs

@ -150,9 +150,6 @@ namespace Grpc.Core.Internal.Tests
}
}
// TODO: other TODOs
// -- provide a null instance of SliceBufferSafeHandle
private byte[] GetTestBuffer(int length)
{
var testBuffer = new byte[length];

@ -131,7 +131,7 @@ namespace Grpc.Core.Internal
{
using (var serializationScope = DefaultSerializationContext.GetInitializedThreadLocalScope())
{
var payload = optionalWrite.HasValue ? UnsafeSerialize(optionalWrite.Value.Response, serializationScope.Context) : null;
var payload = optionalWrite.HasValue ? UnsafeSerialize(optionalWrite.Value.Response, serializationScope.Context) : SliceBufferSafeHandle.NullInstance;
var writeFlags = optionalWrite.HasValue ? optionalWrite.Value.WriteFlags : default(WriteFlags);
lock (myLock)

@ -131,13 +131,6 @@ namespace Grpc.Core.Internal
public void StartSendStatusFromServer(ISendStatusFromServerCompletionCallback callback, Status status, MetadataArraySafeHandle metadataArray, bool sendEmptyInitialMetadata,
SliceBufferSafeHandle optionalPayload, WriteFlags writeFlags)
{
// TODO: optionalPayload == null -> pass null SliceBufferSafeHandle
// do this properly
if (optionalPayload == null)
{
optionalPayload = SliceBufferSafeHandle.NullInstance;
}
using (completionQueue.NewScope())
{
var ctx = completionQueue.CompletionRegistry.RegisterBatchCompletion(CompletionHandler_ISendStatusFromServerCompletionCallback, callback);

@ -117,7 +117,7 @@ namespace Grpc.Microbenchmarks
{
for (int i = 0; i < Iterations; i++)
{
call.StartSendStatusFromServer(this, status, metadata, false, null, WriteFlags.NoCompress);
call.StartSendStatusFromServer(this, status, metadata, false, SliceBufferSafeHandle.NullInstance, WriteFlags.NoCompress);
}
}

Loading…
Cancel
Save