diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-07-13 11:41:02 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-07-15 17:14:26 +0200 |
| commit | 022c4795510306e08a4aba31504ca382d41c7fac (patch) | |
| tree | d4c29f62038d0f336d90f32f46bc5b4f5c3ddc28 /commands | |
| parent | f27e542442d19436f1428cc22bb03aca398d37a7 (diff) | |
hugofs: Make FileMeta a struct
This commit started out investigating a `concurrent map read write` issue, ending by replacing the map with a struct.
This is easier to reason about, and it's more effective:
```
name old time/op new time/op delta
SiteNew/Regular_Deep_content_tree-16 71.5ms ± 3% 69.4ms ± 5% ~ (p=0.200 n=4+4)
name old alloc/op new alloc/op delta
SiteNew/Regular_Deep_content_tree-16 29.7MB ± 0% 27.9MB ± 0% -5.82% (p=0.029 n=4+4)
name old allocs/op new allocs/op delta
SiteNew/Regular_Deep_content_tree-16 313k ± 0% 303k ± 0% -3.35% (p=0.029 n=4+4)
```
See #8749
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/hugo.go | 4 | ||||
| -rw-r--r-- | commands/new.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/commands/hugo.go b/commands/hugo.go index 0f6e4274a..2b53d5cd6 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -697,7 +697,7 @@ func (c *commandeer) getDirList() ([]string, error) { return filepath.SkipDir } - filenames = append(filenames, fi.Meta().Filename()) + filenames = append(filenames, fi.Meta().Filename) } return nil @@ -706,7 +706,7 @@ func (c *commandeer) getDirList() ([]string, error) { watchFiles := c.hugo().PathSpec.BaseFs.WatchDirs() for _, fi := range watchFiles { if !fi.IsDir() { - filenames = append(filenames, fi.Meta().Filename()) + filenames = append(filenames, fi.Meta().Filename) continue } diff --git a/commands/new.go b/commands/new.go index a2d873717..44e2a7e40 100644 --- a/commands/new.go +++ b/commands/new.go @@ -118,7 +118,7 @@ func newContentPathSection(h *hugolib.HugoSites, path string) (string, string) { if h != nil { for _, dir := range h.BaseFs.Content.Dirs { - createpath = strings.TrimPrefix(createpath, dir.Meta().Filename()) + createpath = strings.TrimPrefix(createpath, dir.Meta().Filename) } } |