From 0a31851d859873553a28faf32a590a02d46e027b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 1 Sep 2019 15:17:03 +1000 Subject: [PATCH] Tweak how rac.concReader.Read moves to next work --- lib/rac/conc_reader.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/lib/rac/conc_reader.go b/lib/rac/conc_reader.go index b4af7546..6acb47cc 100644 --- a/lib/rac/conc_reader.go +++ b/lib/rac/conc_reader.go @@ -230,28 +230,21 @@ func (c *concReader) Read(p []byte) (int, error) { if len(p) == 0 { return numRead, nil } - - // Fill p from c.currWork. - if c.currWork.i < c.currWork.j { - n := copy(p, c.currWork.buffer[c.currWork.i:c.currWork.j]) - p = p[n:] - numRead += n - c.pos += int64(n) - c.currWork.i += uint32(n) + if c.currWork.i >= c.currWork.j { err := c.currWork.err - - // Recycle c.currWork if we're done with it. - if c.currWork.i >= c.currWork.j { - c.currWork.recycle() - } - + c.currWork.recycle() if err != nil { return numRead, err } - continue + c.currWork = c.nextWork() } - c.currWork = c.nextWork() + // Fill p from c.currWork. + n := copy(p, c.currWork.buffer[c.currWork.i:c.currWork.j]) + p = p[n:] + numRead += n + c.pos += int64(n) + c.currWork.i += uint32(n) } }