diff options
| author | csharptest <roger@csharptest.net> | 2011-06-02 10:52:37 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-06-02 10:52:37 -0500 |
| commit | 45a93fad4d7123887d14135ee15ee3e9b0d4ca58 (patch) | |
| tree | c62c6a5b4159619de112d4d60bb876d834ca4e94 | |
| parent | efed509b55a1ab6d18b8ef960d799973e7e74544 (diff) | |
| download | protobuf-45a93fad4d7123887d14135ee15ee3e9b0d4ca58.tar.gz protobuf-45a93fad4d7123887d14135ee15ee3e9b0d4ca58.tar.bz2 protobuf-45a93fad4d7123887d14135ee15ee3e9b0d4ca58.zip | |
Optimized access to ByteString from coded io.
| -rw-r--r-- | src/ProtocolBuffers/ByteString.cs | 29 | ||||
| -rw-r--r-- | src/ProtocolBuffers/CodedInputStream.cs | 4 | ||||
| -rw-r--r-- | src/ProtocolBuffers/CodedOutputStream.cs | 14 |
3 files changed, 36 insertions, 11 deletions
diff --git a/src/ProtocolBuffers/ByteString.cs b/src/ProtocolBuffers/ByteString.cs index 2cce287a..83d4a2df 100644 --- a/src/ProtocolBuffers/ByteString.cs +++ b/src/ProtocolBuffers/ByteString.cs @@ -52,6 +52,14 @@ namespace Google.ProtocolBuffers private readonly byte[] bytes;
/// <summary>
+ /// Internal use only. Ensure that the provided array is not mutated and belongs to this instance.
+ /// </summary>
+ internal static ByteString AttachBytes(byte[] bytes)
+ {
+ return new ByteString(bytes);
+ }
+
+ /// <summary>
/// Constructs a new ByteString from the given byte array. The array is
/// *not* copied, and must not be modified after this constructor is called.
/// </summary>
@@ -237,5 +245,26 @@ namespace Google.ProtocolBuffers get { return output; }
}
}
+
+ internal void WriteTo(CodedOutputStream outputStream)
+ {
+ outputStream.WriteRawBytes(bytes, 0, bytes.Length);
+ }
+
+ /// <summary>
+ /// Copies the entire byte array to the destination array provided at the offset specified.
+ /// </summary>
+ public void CopyTo(Array array, int position)
+ {
+ Array.Copy(bytes, 0, array, position, bytes.Length);
+ }
+
+ /// <summary>
+ /// Writes the entire byte array to the provided stream
+ /// </summary>
+ public void WriteTo(System.IO.Stream outputStream)
+ {
+ outputStream.Write(bytes, 0, bytes.Length);
+ }
}
}
\ No newline at end of file diff --git a/src/ProtocolBuffers/CodedInputStream.cs b/src/ProtocolBuffers/CodedInputStream.cs index 225cf4da..a9afbe60 100644 --- a/src/ProtocolBuffers/CodedInputStream.cs +++ b/src/ProtocolBuffers/CodedInputStream.cs @@ -58,7 +58,7 @@ namespace Google.ProtocolBuffers /// TODO(jonskeet): Consider whether recursion and size limits shouldn't be readonly,
/// set at construction time.
/// </remarks>
- public sealed class CodedInputStream
+ public sealed partial class CodedInputStream
{
private readonly byte[] buffer;
private int bufferSize;
@@ -353,7 +353,7 @@ namespace Google.ProtocolBuffers else
{
// Slow path: Build a byte array first then copy it.
- return ByteString.CopyFrom(ReadRawBytes(size));
+ return ByteString.AttachBytes(ReadRawBytes(size));
}
}
diff --git a/src/ProtocolBuffers/CodedOutputStream.cs b/src/ProtocolBuffers/CodedOutputStream.cs index f905b357..f30c8061 100644 --- a/src/ProtocolBuffers/CodedOutputStream.cs +++ b/src/ProtocolBuffers/CodedOutputStream.cs @@ -54,7 +54,7 @@ namespace Google.ProtocolBuffers /// methods are taken from the protocol buffer type names, not .NET types.
/// (Hence WriteFloat instead of WriteSingle, and WriteBool instead of WriteBoolean.)
/// </remarks>
- public sealed class CodedOutputStream
+ public sealed partial class CodedOutputStream
{
/// <summary>
/// The buffer size used by CreateInstance(Stream).
@@ -257,11 +257,9 @@ namespace Google.ProtocolBuffers public void WriteBytes(int fieldNumber, ByteString value)
{
- // TODO(jonskeet): Optimise this! (No need to copy the bytes twice.)
WriteTag(fieldNumber, WireFormat.WireType.LengthDelimited);
- byte[] bytes = value.ToByteArray();
- WriteRawVarint32((uint) bytes.Length);
- WriteRawBytes(bytes);
+ WriteRawVarint32((uint)value.Length);
+ value.WriteTo(this);
}
[CLSCompliant(false)]
@@ -564,10 +562,8 @@ namespace Google.ProtocolBuffers public void WriteBytesNoTag(ByteString value)
{
- // TODO(jonskeet): Optimise this! (No need to copy the bytes twice.)
- byte[] bytes = value.ToByteArray();
- WriteRawVarint32((uint) bytes.Length);
- WriteRawBytes(bytes);
+ WriteRawVarint32((uint)value.Length);
+ value.WriteTo(this);
}
[CLSCompliant(false)]
|