JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix data race in teeReader (#1235)

Browse Source
This commit is contained in:
Kaloyan Raev 2019-02-05 17:18:15 +02:00 committed by Egon Elbre
parent 6564357e13
commit 44346d2c6b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/sync2/tee.go
View File

@ -55,7 +55,7 @@ func newTee(buffer ReadAtWriteAtCloser, readers int, open *int64) ([]PipeReader,
teeReaders[i] = &teeReader{tee: tee}
}
return teeReaders, teeWriter{tee}, nil
return teeReaders, &teeWriter{tee}, nil
}
type teeReader struct {
@ -117,7 +117,7 @@ func (reader *teeReader) Read(data []byte) (n int, err error) {
// Write writes to the buffer returning io.ErrClosedPipe when limit is reached
//
// It will block until at least one reader require the data.
func (writer teeWriter) Write(data []byte) (n int, err error) {
func (writer *teeWriter) Write(data []byte) (n int, err error) {
tee := writer.tee
tee.mu.Lock()
@ -154,13 +154,13 @@ func (writer teeWriter) Write(data []byte) (n int, err error) {
}
// Close implements io.Reader Close
func (reader teeReader) Close() error { return reader.CloseWithError(nil) }
func (reader *teeReader) Close() error { return reader.CloseWithError(nil) }
// Close implements io.Writer Close
func (writer teeWriter) Close() error { return writer.CloseWithError(nil) }
func (writer *teeWriter) Close() error { return writer.CloseWithError(nil) }
// CloseWithError implements closing with error
func (reader teeReader) CloseWithError(reason error) (err error) {
func (reader *teeReader) CloseWithError(reason error) (err error) {
tee := reader.tee
if atomic.CompareAndSwapInt32(&reader.closed, 0, 1) {
err = tee.buffer.Close()
@ -174,7 +174,7 @@ func (reader teeReader) CloseWithError(reason error) (err error) {
}
// CloseWithError implements closing with error
func (writer teeWriter) CloseWithError(reason error) error {
func (writer *teeWriter) CloseWithError(reason error) error {
if reason == nil {
reason = io.EOF
}