TrueCloudLab/rclone
16
0
Fork 4
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity Actions

asyncreader: Make StopBuffer as well as Abandon and fix confusion in callers

Browse source
This commit is contained in:
Nick Craig-Wood 2020-06-08 16:24:29 +01:00
parent 05bc19c331
commit 3c14a893fb
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fs/asyncreader/asyncreader.go
View file

@ -268,9 +268,15 @@ func (a *AsyncReader) SkipBytes(skip int) (ok bool) {
}
}
// Abandon will ensure that the underlying async reader is shut down.
// It will NOT close the input supplied on New.
func (a *AsyncReader) Abandon() {
// StopBuffering will ensure that the underlying async reader is shut
// down so no more is read from the input.
//
// This does not free the memory so Abandon() or Close() need to be
// called on the input.
//
// This does not wait for Read/WriteTo to complete so can be called
// concurrently to those.
func (a *AsyncReader) StopBuffering() {
select {
case <-a.exit:
// Do nothing if reader routine already exited
@ -280,6 +286,14 @@ func (a *AsyncReader) Abandon() {
// Close and wait for go routine
close(a.exit)
<-a.exited
}
// Abandon will ensure that the underlying async reader is shut down
// and memory is returned. It does everything but close the input.
//
// It will NOT close the input supplied on New.
func (a *AsyncReader) Abandon() {
a.StopBuffering()
// take the lock to wait for Read/WriteTo to complete
a.mu.Lock()
defer a.mu.Unlock()