Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Thread safe piecereader #8397

Merged
merged 1 commit into from
Mar 29, 2022
Merged

Thread safe piecereader #8397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion extern/sector-storage/piece_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bufio"
"context"
"io"
"sync"

"github.com/ipfs/go-cid"
"go.opencensus.io/stats"
Expand Down Expand Up @@ -31,6 +32,7 @@ type pieceReader struct {
closed bool
seqAt int64 // next byte to be read by io.Reader

mu sync.Mutex
r io.ReadCloser
br *bufio.Reader
rAt int64
Expand Down Expand Up @@ -62,6 +64,9 @@ func (p *pieceReader) check() error {
}

func (p *pieceReader) Close() error {
p.mu.Lock()
defer p.mu.Unlock()

if err := p.check(); err != nil {
return err
}
Expand All @@ -84,16 +89,22 @@ func (p *pieceReader) Close() error {
}

func (p *pieceReader) Read(b []byte) (int, error) {
p.mu.Lock()
defer p.mu.Unlock()

if err := p.check(); err != nil {
return 0, err
}

n, err := p.ReadAt(b, p.seqAt)
n, err := p.readAtUnlocked(b, p.seqAt)
p.seqAt += int64(n)
return n, err
}

func (p *pieceReader) Seek(offset int64, whence int) (int64, error) {
p.mu.Lock()
defer p.mu.Unlock()

if err := p.check(); err != nil {
return 0, err
}
Expand All @@ -113,6 +124,13 @@ func (p *pieceReader) Seek(offset int64, whence int) (int64, error) {
}

func (p *pieceReader) ReadAt(b []byte, off int64) (n int, err error) {
p.mu.Lock()
defer p.mu.Unlock()

return p.readAtUnlocked(b, off)
}

func (p *pieceReader) readAtUnlocked(b []byte, off int64) (n int, err error) {
if err := p.check(); err != nil {
return 0, err
}
Expand Down