kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge remote-tracking branch 'robryk/bufreader-race'

Browse source
This commit is contained in:
Solomon Hykes 2013-03-29 13:50:33 -07:00
commit f483b214bb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils.go
View file

@ -174,12 +174,12 @@ func (r *bufReader) drain() {
buf := make([]byte, 1024)
for {
n, err := r.reader.Read(buf)
r.l.Lock()
if err != nil {
r.err = err
} else {
r.buf.Write(buf[0:n])
}
r.l.Lock()
r.wait.Signal()
r.l.Unlock()
if err != nil {
@ -189,6 +189,8 @@ func (r *bufReader) drain() {
}
func (r *bufReader) Read(p []byte) (n int, err error) {
r.l.Lock()
defer r.l.Unlock()
for {
n, err = r.buf.Read(p)
if n > 0 {
@ -197,9 +199,7 @@ func (r *bufReader) Read(p []byte) (n int, err error) {
if r.err != nil {
return 0, r.err
}
r.l.Lock()
r.wait.Wait()
r.l.Unlock()
}
return
}