diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-07 12:52:44 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-07 12:52:44 -0700 |
| commit | ff952d292f3fb843f91ef7e0e5ec8772ec3038c5 (patch) | |
| tree | 0f10b623c6482c583545517845bd6ee0b7a8d3db /include | |
| parent | ebec0dba9f9dbcf13e523420e718462eecc1f216 (diff) | |
| parent | f54af4832e08f317a05de909e88fdb38ace92cb0 (diff) | |
Merge github.com:grpc/grpc into write_completion
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/sync_stream.h | 4 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/slice.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/grpc++/impl/codegen/sync_stream.h b/include/grpc++/impl/codegen/sync_stream.h index 3fa208963d..c1784f1820 100644 --- a/include/grpc++/impl/codegen/sync_stream.h +++ b/include/grpc++/impl/codegen/sync_stream.h @@ -244,7 +244,7 @@ class ClientWriterInterface : public ClientStreamingInterface, public WriterInterface<W> { public: /// Half close writing from the client. (signal that the stream of messages - /// coming from the clinet is complete). + /// coming from the client is complete). /// Blocks until currently-pending writes are completed. /// Thread safe with respect to \a ReaderInterface::Read operations only /// @@ -375,7 +375,7 @@ class ClientReaderWriterInterface : public ClientStreamingInterface, virtual void WaitForInitialMetadata() = 0; /// Half close writing from the client. (signal that the stream of messages - /// coming from the clinet is complete). + /// coming from the client is complete). /// Blocks until currently-pending writes are completed. /// Thread-safe with respect to \a ReaderInterface::Read /// diff --git a/include/grpc/impl/codegen/slice.h b/include/grpc/impl/codegen/slice.h index a04c683a55..128fa8e121 100644 --- a/include/grpc/impl/codegen/slice.h +++ b/include/grpc/impl/codegen/slice.h @@ -62,7 +62,12 @@ typedef struct grpc_slice_refcount { struct grpc_slice_refcount *sub_refcount; } grpc_slice_refcount; -#define GRPC_SLICE_INLINED_SIZE (sizeof(size_t) + sizeof(uint8_t *) - 1) +/* Inlined half of grpc_slice is allowed to expand the size of the overall type + by this many bytes */ +#define GRPC_SLICE_INLINE_EXTRA_SIZE sizeof(void *) + +#define GRPC_SLICE_INLINED_SIZE \ + (sizeof(size_t) + sizeof(uint8_t *) - 1 + GRPC_SLICE_INLINE_EXTRA_SIZE) /** A grpc_slice s, if initialized, represents the byte range s.bytes[0..s.length-1]. |