qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-05 18:56:10 -07:00
Code Releases Activity

godoc: include dir listing in rate limit, log dir reading errors

Browse Source 
Updates golang/go#14252

Change-Id: I3ce2a410708900f5c80d15e722b410855fd9c571
Reviewed-on: https://go-review.googlesource.com/47651
Reviewed-by: Dmitri Shuralyov <shurcool@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Brad Fitzpatrick 2017-07-06 18:30:37 +00:00
parent c2d03f470b
commit 72ed06fbe2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
godoc/dirtrees.go
View File

@ -53,7 +53,9 @@ type treeBuilder struct {
maxDepth int maxDepth int
} }
var parseFileGate = make(chan bool, 20) // parse up to 20 files concurrently // ioGate is a semaphore controlling VFS activity (ReadDir, parseFile, etc).
// Send before an operation and receive after.
var ioGate = make(chan bool, 20)
func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth int) *Directory { func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth int) *Directory {
if name == testdataDirName { if name == testdataDirName {
@ -86,7 +88,16 @@ func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth i
} }
} }
list, _ := b.c.fs.ReadDir(path) ioGate <- true
list, err := b.c.fs.ReadDir(path)
<-ioGate
if err != nil {
// TODO: propagate more. See golang.org/issue/14252.
// For now:
if b.c.Verbose {
log.Printf("newDirTree reading %s: %v", path, err)
}
}
// determine number of subdirectories and if there are package files // determine number of subdirectories and if there are package files
var dirchs []chan *Directory var dirchs []chan *Directory
@ -106,10 +117,10 @@ func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth i
// don't just count it yet (otherwise we may end up with hasPkgFiles even // don't just count it yet (otherwise we may end up with hasPkgFiles even
// though the directory doesn't contain any real package files - was bug) // though the directory doesn't contain any real package files - was bug)
// no "optimal" package synopsis yet; continue to collect synopses // no "optimal" package synopsis yet; continue to collect synopses
parseFileGate <- true ioGate <- true
const flags = parser.ParseComments | parser.PackageClauseOnly const flags = parser.ParseComments | parser.PackageClauseOnly
file, err := b.c.parseFile(fset, filename, flags) file, err := b.c.parseFile(fset, filename, flags)
<-parseFileGate <-ioGate
if err != nil { if err != nil {
if b.c.Verbose { if b.c.Verbose {
log.Printf("Error parsing %v: %v", filename, err) log.Printf("Error parsing %v: %v", filename, err)