mirror of
https://github.com/ScuroNeko/mtg.git
synced 2026-08-31 21:34:02 +03:00
Avoid double buffering in TLS hot path
This commit is contained in:
@@ -61,14 +61,14 @@ func (c Conn) start() {
|
|||||||
for c.p.writeStream.Len() == 0 && !c.p.done {
|
for c.p.writeStream.Len() == 0 && !c.p.done {
|
||||||
c.p.writtenCond.Wait()
|
c.p.writtenCond.Wait()
|
||||||
}
|
}
|
||||||
n, _ := c.p.writeStream.Read(buf[:size])
|
n, _ := c.p.writeStream.Read(buf[tls.SizeHeader : tls.SizeHeader+size])
|
||||||
c.p.writtenCond.L.Unlock()
|
c.p.writtenCond.L.Unlock()
|
||||||
|
|
||||||
if n == 0 {
|
if n == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := tls.WriteRecord(c.Conn, buf[:n]); err != nil {
|
if err := tls.WriteRecordInPlace(c.Conn, buf[:], n); err != nil {
|
||||||
c.p.ctxCancel(err)
|
c.p.ctxCancel(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,20 +29,24 @@ func ReadRecord(r io.Reader, w io.Writer) (byte, int64, error) {
|
|||||||
|
|
||||||
func WriteRecord(w io.Writer, payload []byte) error {
|
func WriteRecord(w io.Writer, payload []byte) error {
|
||||||
buf := [MaxRecordSize]byte{}
|
buf := [MaxRecordSize]byte{}
|
||||||
buf[0] = TypeApplicationData
|
copy(buf[SizeHeader:], payload)
|
||||||
|
|
||||||
bufV := buf[SizeRecordType:]
|
return WriteRecordInPlace(w, buf[:], len(payload))
|
||||||
copy(bufV[:SizeVersion], TLSVersion[:])
|
}
|
||||||
|
|
||||||
bufS := bufV[SizeVersion:]
|
func WriteRecordInPlace(w io.Writer, buf []byte, payloadLen int) error {
|
||||||
binary.BigEndian.PutUint16(bufS[:SizeSize], uint16(len(payload)))
|
if payloadLen > MaxRecordPayloadSize {
|
||||||
|
return fmt.Errorf("payload %d exceeds max %d", payloadLen, MaxRecordPayloadSize)
|
||||||
bufP := buf[SizeHeader:]
|
|
||||||
if n := copy(bufP, payload); n != len(payload) {
|
|
||||||
return fmt.Errorf("copied %d bytes of payload instead of %d", n, len(payload))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err := w.Write(buf[:SizeHeader+len(payload)])
|
buf[0] = TypeApplicationData
|
||||||
|
copy(buf[SizeRecordType:SizeRecordType+SizeVersion], TLSVersion[:])
|
||||||
|
binary.BigEndian.PutUint16(
|
||||||
|
buf[SizeRecordType+SizeVersion:SizeRecordType+SizeVersion+SizeSize],
|
||||||
|
uint16(payloadLen),
|
||||||
|
)
|
||||||
|
|
||||||
|
_, err := w.Write(buf[:SizeHeader+payloadLen])
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,6 +119,84 @@ func (suite *UtilsTestSuite) TestWriteRecordPayloadTooLarge() {
|
|||||||
suite.Error(err)
|
suite.Error(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (suite *UtilsTestSuite) TestWriteRecordInPlace() {
|
||||||
|
payload := []byte("hello in-place")
|
||||||
|
|
||||||
|
var buf [MaxRecordSize]byte
|
||||||
|
copy(buf[SizeHeader:], payload)
|
||||||
|
|
||||||
|
err := WriteRecordInPlace(suite.dst, buf[:], len(payload))
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
written := suite.dst.Bytes()
|
||||||
|
suite.Equal(byte(TypeApplicationData), written[0])
|
||||||
|
suite.Equal(TLSVersion[:], written[SizeRecordType:SizeRecordType+SizeVersion])
|
||||||
|
|
||||||
|
length := binary.BigEndian.Uint16(written[SizeRecordType+SizeVersion:])
|
||||||
|
suite.Equal(uint16(len(payload)), length)
|
||||||
|
suite.Equal(payload, written[SizeHeader:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *UtilsTestSuite) TestWriteRecordInPlaceRoundTrip() {
|
||||||
|
payload := []byte("round trip in-place")
|
||||||
|
|
||||||
|
var buf [MaxRecordSize]byte
|
||||||
|
copy(buf[SizeHeader:], payload)
|
||||||
|
|
||||||
|
var wire bytes.Buffer
|
||||||
|
|
||||||
|
err := WriteRecordInPlace(&wire, buf[:], len(payload))
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
var recovered bytes.Buffer
|
||||||
|
|
||||||
|
recordType, length, err := ReadRecord(&wire, &recovered)
|
||||||
|
suite.NoError(err)
|
||||||
|
suite.Equal(byte(TypeApplicationData), recordType)
|
||||||
|
suite.Equal(int64(len(payload)), length)
|
||||||
|
suite.Equal(payload, recovered.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *UtilsTestSuite) TestWriteRecordInPlacePayloadTooLarge() {
|
||||||
|
var buf [MaxRecordSize]byte
|
||||||
|
|
||||||
|
err := WriteRecordInPlace(suite.dst, buf[:], MaxRecordPayloadSize+1)
|
||||||
|
suite.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *UtilsTestSuite) TestWriteRecordInPlacePropagatesError() {
|
||||||
|
m := &WriterMock{}
|
||||||
|
m.
|
||||||
|
On("Write", mock.AnythingOfType("[]uint8")).
|
||||||
|
Once().
|
||||||
|
Return(0, errors.New("disk full"))
|
||||||
|
|
||||||
|
var buf [MaxRecordSize]byte
|
||||||
|
copy(buf[SizeHeader:], []byte("data"))
|
||||||
|
|
||||||
|
err := WriteRecordInPlace(m, buf[:], 4)
|
||||||
|
suite.Error(err)
|
||||||
|
|
||||||
|
m.AssertExpectations(suite.T())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *UtilsTestSuite) TestWriteRecordInPlaceMatchesWriteRecord() {
|
||||||
|
payload := []byte("equivalence check")
|
||||||
|
|
||||||
|
var legacy bytes.Buffer
|
||||||
|
err := WriteRecord(&legacy, payload)
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
var buf [MaxRecordSize]byte
|
||||||
|
copy(buf[SizeHeader:], payload)
|
||||||
|
|
||||||
|
var inPlace bytes.Buffer
|
||||||
|
err = WriteRecordInPlace(&inPlace, buf[:], len(payload))
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
suite.Equal(legacy.Bytes(), inPlace.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
func TestUtils(t *testing.T) {
|
func TestUtils(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
suite.Run(t, &UtilsTestSuite{})
|
suite.Run(t, &UtilsTestSuite{})
|
||||||
|
|||||||
Reference in New Issue
Block a user