Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buffer writes when sending protobufs #182

Merged
merged 2 commits into from
Aug 6, 2018
Merged

buffer writes when sending protobufs #182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d6ed07
buffer writes when sending protobufs
marten-seemann Aug 5, 2018
da02d4a
also use the buffered writer for handling new messages
marten-seemann Aug 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions dht_net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dht

import (
"bufio"
"context"
"fmt"
"io"
Expand All @@ -17,6 +18,31 @@ import (
var dhtReadMessageTimeout = time.Minute
var ErrReadTimeout = fmt.Errorf("timed out reading response")

type bufferedWriteCloser interface {
ggio.WriteCloser
Flush() error
}

// The Protobuf writer performs multiple small writes when writing a message.
// We need to buffer those writes, to make sure that we're not sending a new
// packet for every single write.
type bufferedDelimitedWriter struct {
*bufio.Writer
ggio.WriteCloser
}

func newBufferedDelimitedWriter(str io.Writer) bufferedWriteCloser {
w := bufio.NewWriter(str)
return &bufferedDelimitedWriter{
Writer: w,
WriteCloser: ggio.NewDelimitedWriter(w),
}
}

func (w *bufferedDelimitedWriter) Flush() error {
return w.Writer.Flush()
}

// handleNewStream implements the inet.StreamHandler
func (dht *IpfsDHT) handleNewStream(s inet.Stream) {
go dht.handleNewMessage(s)
Expand All @@ -27,7 +53,7 @@ func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
cr := ctxio.NewReader(ctx, s) // ok to use. we defer close stream in this func
cw := ctxio.NewWriter(ctx, s) // ok to use. we defer close stream in this func
r := ggio.NewDelimitedReader(cr, inet.MessageSizeMax)
w := ggio.NewDelimitedWriter(cw)
w := newBufferedDelimitedWriter(cw)
mPeer := s.Conn().RemotePeer()

for {
Expand Down Expand Up @@ -70,7 +96,11 @@ func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
}

// send out response msg
if err := w.WriteMsg(rpmes); err != nil {
err = w.WriteMsg(rpmes)
if err == nil {
err = w.Flush()
}
if err != nil {
s.Reset()
log.Debugf("send response error: %s", err)
return
Expand Down Expand Up @@ -160,7 +190,7 @@ func (dht *IpfsDHT) messageSenderForPeer(p peer.ID) (*messageSender, error) {
type messageSender struct {
s inet.Stream
r ggio.ReadCloser
w ggio.WriteCloser
w bufferedWriteCloser
lk sync.Mutex
p peer.ID
dht *IpfsDHT
Expand Down Expand Up @@ -204,7 +234,7 @@ func (ms *messageSender) prep() error {
}

ms.r = ggio.NewDelimitedReader(nstr, inet.MessageSizeMax)
ms.w = ggio.NewDelimitedWriter(nstr)
ms.w = newBufferedDelimitedWriter(nstr)
ms.s = nstr

return nil
Expand All @@ -224,7 +254,7 @@ func (ms *messageSender) SendMessage(ctx context.Context, pmes *pb.Message) erro
return err
}

if err := ms.w.WriteMsg(pmes); err != nil {
if err := ms.writeMsg(pmes); err != nil {
ms.s.Reset()
ms.s = nil

Expand Down Expand Up @@ -260,7 +290,7 @@ func (ms *messageSender) SendRequest(ctx context.Context, pmes *pb.Message) (*pb
return nil, err
}

if err := ms.w.WriteMsg(pmes); err != nil {
if err := ms.writeMsg(pmes); err != nil {
ms.s.Reset()
ms.s = nil

Expand Down Expand Up @@ -302,6 +332,13 @@ func (ms *messageSender) SendRequest(ctx context.Context, pmes *pb.Message) (*pb
}
}

func (ms *messageSender) writeMsg(pmes *pb.Message) error {
if err := ms.w.WriteMsg(pmes); err != nil {
return err
}
return ms.w.Flush()
}

func (ms *messageSender) ctxReadMsg(ctx context.Context, mes *pb.Message) error {
errc := make(chan error, 1)
go func(r ggio.ReadCloser) {
Expand Down